[Qa-jenkins-scm] [jenkins.debian.net] 01/02: reproducible: fix logic error

Holger Levsen holger at moszumanska.debian.org
Fri Mar 27 19:56:34 UTC 2015


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 4131fb9d3d83c7b4df459c7e33d7eff91a24170c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Mar 27 20:53:11 2015 +0100

    reproducible: fix logic error
---
 bin/reproducible_build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 2b9c5d8..d00b2ad 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -211,7 +211,7 @@ else
 		set +x
 		echo "Warning: Maybe there was a network problem, or ${SRCPACKAGE} is not a source package in ${SUITE}, or was removed or renamed. Please investigate." | tee -a ${RBUILDLOG}
 		update_db_and_html
-		SAVE_ARTIFACTS=2
+		if [ $SAVE_ARTIFACTS -eq 1 ] ; then SAVE_ARTIFACTS=2 ; fi
 		exit 0
 	else
 		VERSION=$(grep "^Version: " ${SRCPACKAGE}_*.dsc| head -1 | egrep -v '(GnuPG v|GnuPG/MacGPG2)' | cut -d " " -f2-)
@@ -250,7 +250,7 @@ else
 			set +x
 			echo "Package ${SRCPACKAGE} (${VERSION}) shall only be build on \"$(echo "${ARCHITECTURES}" | xargs echo )\" and thus was skipped." | tee -a ${RBUILDLOG}
 			update_db_and_html
-			SAVE_ARTIFACTS=2
+			if [ $SAVE_ARTIFACTS -eq 1 ] ; then SAVE_ARTIFACTS=2 ; fi
 			exit 0
 		fi
 		set +e
@@ -308,7 +308,7 @@ else
 			sqlite3 -init $INIT ${PACKAGES_DB} "REPLACE INTO results (package_id, version, status, build_date, build_duration) VALUES ('${SRCPKGID}', '${VERSION}', 'FTBFS', '$DATE', '$DURATION')"
 			sqlite3 -init $INIT ${PACKAGES_DB} "INSERT INTO stats_build (name, version, suite, architecture, status, build_date, build_duration) VALUES ('${SRCPACKAGE}', '${VERSION}', '${SUITE}', '${ARCH}', 'FTBFS', '${DATE}', '${DURATION}')"
 			update_db_and_html
-			SAVE_ARTIFACTS=2
+			if [ $SAVE_ARTIFACTS -eq 1 ] ; then SAVE_ARTIFACTS=2 ; fi
 		fi
 	fi
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git



More information about the Qa-jenkins-scm mailing list