[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible alpine: use apk version instead of vercmp

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
deb36b07 by kpcyrd at 2019-06-08T14:31:07Z
reproducible alpine: use apk version instead of vercmp

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_alpine_scheduler.sh


Changes:

=====================================
bin/reproducible_alpine_scheduler.sh
=====================================
@@ -111,8 +111,8 @@ update_alpine_repositories() {
 					PKG_ID=$(query_db "SELECT id FROM sources WHERE distribution=$DISTROID AND name='$PKG' AND suite='$SUITE' AND architecture='$ARCH';")
 					query_db "INSERT INTO schedule (package_id, date_scheduled) VALUES ('${PKG_ID}', '$DATE');"
 				elif [ "$VERSION" != "$version" ] ; then
-					VERCMP="$(schroot --run-session -c $SESSION --directory /var/tmp -- vercmp $version $VERSION || true)"
-					if [ "$VERCMP" = "1" ] ; then
+					VERCMP="$(schroot --run-session -c $SESSION --directory /var/tmp -- apk version -t $version $VERSION || true)"
+					if [ "$VERCMP" = ">" ] ; then
 						# known package with new version, so update db and schedule
 						query_db "UPDATE sources SET version = '$version' WHERE name = '$PKG' AND suite = '$SUITE' AND architecture='$ARCH' AND distribution=$DISTROID;"
 						PKG_STATUS=$(query_db "SELECT r.status FROM results AS r
@@ -137,7 +137,7 @@ update_alpine_repositories() {
 								echo " $PKG (package_id: ${PKG_ID}) already scheduled, not scheduling again."
 							fi
 						fi
-					elif [ "$VERCMP" = "-1" ] ; then
+					elif [ "$VERCMP" = "<" ] ; then
 						# our version is higher than what's in the repo because we build trunk
 						echo "$REPO/$pkgbase $VERSION in db is higher than $version in repo because we build trunk."
 					else



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/deb36b07f473788209376f938e6c942b27796aa3

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/deb36b07f473788209376f938e6c942b27796aa3
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20190608/b2ec4012/attachment-0001.html>