[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Arch Linux: only try to schedule packages if not scheduled already (or known bad version)

[Holger Levsen]

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 528681239db5852055e65b98f006f65d5e0b111b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Dec 1 10:40:15 2017 +0000

    reproducible Arch Linux: only try to schedule packages if not scheduled already (or known bad version)
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_archlinux_scheduler.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible_archlinux_scheduler.sh b/bin/reproducible_archlinux_scheduler.sh
index 1a16b74..2f5f7ed 100755
--- a/bin/reproducible_archlinux_scheduler.sh
+++ b/bin/reproducible_archlinux_scheduler.sh
@@ -32,11 +32,11 @@ update_archlinux_repositories() {
 		grep "^$REPO" "$ARCHLINUX_PKGS"_full_pkgbase_list | \
 			while read repo pkgbase version; do
 				VERSION=$(cat $BASE/archlinux/$REPO/$pkgbase/pkg.version 2>/dev/null || echo 0.rb-unknown-1)
-				if [ "$VERSION" = "0.rb-unknown-1" ] ; then
-					echo -n "$(date -u ) - we know $REPO/$pkgbase has dummy $VERSION version, but c'est la vie... "
-				elif [ "$(schroot --run-session -c $SESSION --directory /var/tmp -- vercmp $version $VERSION)" = "1" ] ; then
-					echo -n "$(date -u ) - we know about $REPO/$pkgbase $VERSION, but the repo has $version, so rescheduling... "
-					touch $BASE/archlinux/$REPO/$pkgbase/pkg.needs_build
+				if [ "$VERSION" != "0.rb-unknown-1" ] || [ ! -f $BASE/archlinux/$REPO/$pkgbase/pkg.needs_build ] ; then
+					if [ "$(schroot --run-session -c $SESSION --directory /var/tmp -- vercmp $version $VERSION)" = "1" ] ; then
+						echo -n "$(date -u ) - we know about $REPO/$pkgbase $VERSION, but the repo has $version, so rescheduling... "
+						touch $BASE/archlinux/$REPO/$pkgbase/pkg.needs_build
+					fi
 				fi
 				printf '%s %s\n' "$pkgbase" "$version"
 			done > "$ARCHLINUX_PKGS"_"$REPO"

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