[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: diffoscope distribution test: fix detection of version number in Arch Linux

Holger Levsen gitlab at salsa.debian.org
Wed Jul 10 17:31:40 BST 2019



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


Commits:
d4d8adf1 by Holger Levsen at 2019-07-10T16:31:33Z
reproducible: diffoscope distribution test: fix detection of version number in Arch Linux

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

- - - - -


1 changed file:

- bin/diffoscope_distribution_test.sh


Changes:

=====================================
bin/diffoscope_distribution_test.sh
=====================================
@@ -68,7 +68,12 @@ check_github_macports() {
 check_whohas() {
 	# the following is "broken" (but good enough for now)
 	# as sort doesn't do proper version comparison
-	DIFFOSCOPE_IN_WHOHAS=$(whohas -d $DISTRIBUTION diffoscope | grep -v "href=" | awk '{print $3}' | sort -n | tail -1)
+	case $DISTRIBUTION in
+		Arch)	DIFFOSCOPE_IN_WHOHAS=$(whohas -d $DISTRIBUTION diffoscope | grep -v "href=" | awk '{print $2}' | cut -d '>' -f2 | cut -d '<' -f1 | sort -n | tail -1)
+			;;
+		*)	DIFFOSCOPE_IN_WHOHAS=$(whohas -d $DISTRIBUTION diffoscope | grep -v "href=" | awk '{print $3}' | sort -n | tail -1)
+			;;
+	esac
 	echo
 	echo
 	if [ "$DIFFOSCOPE_IN_DEBIAN" = "$DIFFOSCOPE_IN_WHOHAS" ] ; then



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/d4d8adf1c04f5687d12a8a266524789fd2f727a1
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/20190710/0f84b978/attachment-0001.html>


More information about the Qa-jenkins-scm mailing list