[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] fixup fa0996b4: reproducible Archlinux: exclusivly use the db to track blacklisted packages

[Holger Levsen]

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


Commits:
ad3c8bc7 by Holger Levsen at 2018-12-03T15:01:35Z
fixup fa0996b4: reproducible Archlinux: exclusivly use the db to track blacklisted packages

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

- - - - -


2 changed files:

- bin/reproducible_archlinux_scheduler.sh
- bin/reproducible_common.sh


Changes:

=====================================
bin/reproducible_archlinux_scheduler.sh
=====================================
@@ -115,7 +115,11 @@ update_archlinux_repositories() {
 					if [ "$VERCMP" = "1" ] ; 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';"
-						PKG_STATUS=$(query_db "SELECT status FROM results WHERE package_id='$PKG_ID';")
+						PKG_STATUS=$(query_db "SELECT r.status FROM results AS r
+							JOIN sources as s on s.id=r.package_id
+							WHERE s.architecture='x86_64'
+							AND s.name='$PKG'
+							AND s.suite='$SUITE';")
 						if [ "$PKG_STATUS" = "BLACKLISTED" ] ; then
 							echo "$PKG is blacklisted, so not scheduling it."
 							continue


=====================================
bin/reproducible_common.sh
=====================================
@@ -1083,11 +1083,11 @@ create_pkg_html() {
 			STATE=FTBFS_4
 			buffer_message='failed to build, pkg relations contain invalid characters'
 		else
-			STATE=query_db "SELECT r.status FROM results AS r
+			STATE=$(query_db "SELECT r.status FROM results AS r
 				JOIN sources as s on s.id=r.package_id
 				WHERE s.architecture='x86_64'
 				AND s.name='$SRCPACKAGE'
-				AND s.suite='archlinux_$REPOSITORY';"
+				AND s.suite='archlinux_$REPOSITORY';")
 			if [ "$STATE" = "BLACKLISTED" ] ; then
 				buffer_message='blacklisted'
 			else



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/ad3c8bc772e4adefe308f1df775a5680a2873137
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/20181203/7c02fa9b/attachment-0001.html>