From b613dace492770d65b5e0d67c337b92cc1595bd3 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Tue, 17 Dec 2019 18:43:50 +0300 Subject: [PATCH 1/2] clean chroot --- build-rpm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-rpm.sh b/build-rpm.sh index 1bdf73b..7a323d7 100755 --- a/build-rpm.sh +++ b/build-rpm.sh @@ -289,9 +289,9 @@ do sleep ${WAIT_TIME} fi fi - $MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${spec_name} --sources=$build_package --no-cleanup-after --no-clean $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER + $MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${spec_name} --sources=$build_package $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER else - $MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${spec_name} --sources=$build_package --no-cleanup-after $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER + $MOCK_BIN -v --configdir=$config_dir --buildsrpm --spec=$build_package/${spec_name} --sources=$build_package $extra_build_src_rpm_options --resultdir=$OUTPUT_FOLDER fi rc=${PIPESTATUS[0]} From f9ebec9e73a29764236c8c1b662d854cb5f0f37e Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Tue, 17 Dec 2019 18:57:29 +0300 Subject: [PATCH 2/2] clean chroot --- build-rpm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-rpm.sh b/build-rpm.sh index 7a323d7..4c30d6e 100755 --- a/build-rpm.sh +++ b/build-rpm.sh @@ -336,7 +336,7 @@ do # need to add tee > log # because of some weird reason --readdrepo does not place root.log in the proper place $MOCK_BIN --readdrepo -v --configdir $config_dir --resultdir=$OUTPUT_FOLDER 2>&1 | tee $OUTPUT_FOLDER/build.log.tmp - $MOCK_BIN -v --configdir=$config_dir --rebuild $OUTPUT_FOLDER/*.src.rpm --no-cleanup-after --no-clean $extra_build_rpm_options --resultdir=$OUTPUT_FOLDER + $MOCK_BIN -v --configdir=$config_dir --rebuild $OUTPUT_FOLDER/*.src.rpm --no-cleanup-after $extra_build_rpm_options --resultdir=$OUTPUT_FOLDER rc=${PIPESTATUS[0]} try_rebuild=false if [[ $rc != 0 && $retry < $MAX_RETRIES ]] ; then