[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Arch Linux: only compare versions if they are different

[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 8cddc6e1c1b084c7a4716d034c2b895613fa4bdd
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Dec 11 19:21:46 2017 +0000

    reproducible Arch Linux: only compare versions if they are different
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_archlinux_scheduler.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible_archlinux_scheduler.sh b/bin/reproducible_archlinux_scheduler.sh
index 62235cd..86588c2 100755
--- a/bin/reproducible_archlinux_scheduler.sh
+++ b/bin/reproducible_archlinux_scheduler.sh
@@ -46,11 +46,14 @@ update_archlinux_repositories() {
 				elif [ ! -f $BASE/archlinux/$REPO/$pkgbase/pkg.needs_build ] ; 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
+						if [ "$VERSION" != "$version" ] ; then
+							echo "We know about $PKG $VERSION, but repo has $version."
+							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
+							fi
 						fi
 					else
 						echo "$(date -u ) - scheduling new package $REPO/$pkgbase... though this is strange and should not really happen…"

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