[Qa-jenkins-scm] [jenkins.debian.net] 01/01: fixup c39837356: reproducible Arch Linux: fix logic so that old packages actually get schedules

[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 88a393042df3033a74ce24e9a8aa1d354b323778
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Dec 7 15:24:31 2017 +0000

    fixup c39837356: reproducible Arch Linux: fix logic so that old packages actually get schedules
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_archlinux_scheduler.sh | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/bin/reproducible_archlinux_scheduler.sh b/bin/reproducible_archlinux_scheduler.sh
index 9078feb..1d9b585 100755
--- a/bin/reproducible_archlinux_scheduler.sh
+++ b/bin/reproducible_archlinux_scheduler.sh
@@ -44,17 +44,23 @@ update_archlinux_repositories() {
 					mkdir -p $BASE/archlinux/$REPO/$pkgbase
 					touch $BASE/archlinux/$REPO/$pkgbase/pkg.needs_build
 				elif [ ! -f $BASE/archlinux/$REPO/$pkgbase/pkg.needs_build ] ; then
-					VERSION=$(cat $BASE/archlinux/$REPO/$pkgbase/pkg.version 2>/dev/null)
-					if [ "$(schroot --run-session -c $SESSION --directory /var/tmp -- vercmp $version $VERSION)" = "1" ] ; then
-						# schedule packages where an updated version is availble
-						echo $REPO/$pkgbase >> $UPDATED
-						echo "$(date -u ) - we know about $REPO/$pkgbase $VERSION, but the repo has $version, so rescheduling... "
-						touch $BASE/archlinux/$REPO/$pkgbase/pkg.needs_build
-						# schedule packages we already know about
-						# (but only until 300 packages are scheduled in total)
-						if [ $(find $BASE/archlinux/ -name pkg.needs_build | wc -l ) -le 300 ] ; then
+					if [ -f $BASE/archlinux/$REPO/$pkgbase/pkg.version ] ; then
+						VERSION=$(cat $BASE/archlinux/$REPO/$pkgbase/pkg.version 2>/dev/null)
+						if [ "$(schroot --run-session -c $SESSION --directory /var/tmp -- vercmp $version $VERSION)" = "1" ] ; then
+							# schedule packages where an updated version is availble
+							echo $REPO/$pkgbase >> $UPDATED
+							echo "$(date -u ) - we know about $REPO/$pkgbase $VERSION, but the repo has $version, so rescheduling... "
 							touch $BASE/archlinux/$REPO/$pkgbase/pkg.needs_build
+						else
+							# schedule packages we already know about
+							# (but only until 300 packages are scheduled in total)
+							if [ $(find $BASE/archlinux/ -name pkg.needs_build | wc -l ) -le 300 ] ; then
+								touch $BASE/archlinux/$REPO/$pkgbase/pkg.needs_build
+							fi
 						fi
+					else
+						echo "$(date -u ) - scheduling new package $REPO/$pkgbase... though this is strange and should not really happen…"
+						touch $BASE/archlinux/$REPO/$pkgbase/pkg.needs_build
 					fi
 				fi
 				printf '%s %s\n' "$pkgbase" "$version" >> $TMPPKGLIST

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