From e14329dea25f4ad8efbc77e4a115ed4e778b2758 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Wed, 10 Apr 2019 17:42:34 +0300 Subject: [PATCH] replace save_buildroot to prevent cleanup before saving --- build-rpm.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-rpm.sh b/build-rpm.sh index 285a03f..7cd4be7 100755 --- a/build-rpm.sh +++ b/build-rpm.sh @@ -368,6 +368,10 @@ echo '--> Create rpm -qa list' CHROOT_PATH="$($MOCK_BIN --configdir=$config_dir --print-root-path)" rpm --root="$CHROOT_PATH" -qa > "$OUTPUT_FOLDER/rpm-qa.log" +# (tpg) Save build chroot +if [ "${rc}" != 0 ] && [ "${save_buildroot}" = 'true' ]; then + sudo tar --exclude=root/dev -zcvf "${OUTPUT_FOLDER}"/rpm-buildroot.tar.gz /var/lib/mock-urpm/$platform_name-$platform_arch/root/ +fi # Check exit code after build if [ $rc != 0 ]; then echo '--> Build failed: mock-urpm encountered a problem.' @@ -384,10 +388,6 @@ echo '--> Done.' echo "--> Grepping rpmlint logs from $OUTPUT_FOLDER/build.log to $OUTPUT_FOLDER/rpmlint.log" sed -n "/Executing \"\/usr\/bin\/rpmlint/,/packages and.*specfiles checked/p" $OUTPUT_FOLDER/build.log > $OUTPUT_FOLDER/rpmlint.log -# (tpg) Save build chroot -if [ "${rc}" != 0 ] && [ "${save_buildroot}" = 'true' ]; then - sudo tar --exclude=root/dev -zcvf "${OUTPUT_FOLDER}"/rpm-buildroot.tar.gz /var/lib/mock-urpm/$platform_name-$platform_arch/root/ -fi # Test RPM files if [ "$use_extra_tests" = 'true' ]; then