[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: builtin-pho overview: include fix c39573cb7 from bremner...

[Holger Levsen (@holger)]

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


Commits:
cfe68cba by Holger Levsen at 2021-10-14T14:45:18+02:00
reproducible Debian: builtin-pho overview: include fix c39573cb7 from bremner from builtin-pho.git/demos

look at the source version for builds as well.

This deals with binNMUs better, since the binNMU version will never
match the source version. The previous change in 2d78b9a3 was incomplete,
since it only modified the check for binary packages.

(2d78b9a3 in builtin-pho.git is e095c249 in this repo.)

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

- - - - -


1 changed file:

- bin/reproducible_html_builtin-pho.sh


Changes:

=====================================
bin/reproducible_html_builtin-pho.sh
=====================================
@@ -1,8 +1,12 @@
 #!/bin/bash
 # vim: set noexpandtab:
 
-# Copyright 2020 Holger Levsen <holger at layer-acht.org>
+# Copyright 2020-2021 Holger Levsen <holger at layer-acht.org>
 # released under the GPLv2
+#
+# Many thanks to David Bremner for https://salsa.debian.org/bremner/builtin-pho.git
+# on which this relies and is based.
+#
 
 DEBUG=false
 . /srv/jenkins/bin/common-functions.sh
@@ -11,11 +15,6 @@ common_init "$@"
 # common code for tests.reproducible-builds.org
 . /srv/jenkins/bin/reproducible_common.sh
 
-#
-# Many thanks to David Bremner for https://salsa.debian.org/bremner/builtin-pho.git
-# on which this relies.
-#
-
 # 3 things to be done/FIXME:
 # - create graphs
 # - import the data from the database on ionos7 into the one on jenkins
@@ -45,7 +44,7 @@ FROM
 WHERE
       p.suite='$LOCALSUITE'
       AND b.source=p.source
-      AND p.source_version=b.version
+      AND p.source_version=b.source_version
       AND ( (b.arch_all AND p.arch='all') OR
             (b.arch_$ARCH AND p.arch='$ARCH') )
 ORDER BY source
@@ -66,7 +65,7 @@ EXCEPT
 FROM binary_packages p, builds b
 WHERE
       b.source=p.source
-      AND p.source_version=b.version
+      AND p.source_version=b.source_version
       AND ( (b.arch_all AND p.arch='all') OR
             (b.arch_$ARCH AND p.arch='$ARCH') )
 ORDER BY source



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/cfe68cba5434e50e6d66bd1b6e47cd4a63ec1a28
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/20211014/c91aff06/attachment-0001.htm>