Hi,
Attached is the following:
commit 8760e9cf7965152e04d57e36eaee89e8752c7c92
Author: Chris Lamb <la...@debian.org>
Date: Sat Mar 18 19:12:28 2017 +0000
diffoscope_distribution_test.sh: Prefer experimental over unstable/sid
when calculating "diffoscope in Debian" version.
Signed-off-by: Chris Lamb <la...@debian.org>
bin/diffoscope_distribution_test.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
commit b4c1a238cc160e9a03cab02ec9a8f84564d1b08e
Author: Chris Lamb <la...@debian.org>
Date: Sat Mar 18 19:13:06 2017 +0000
diffoscope_distribution_test.sh: Match distribution exactly (eg. reject
"buildd-experimental")
Signed-off-by: Chris Lamb <la...@debian.org>
bin/diffoscope_distribution_test.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
You can also merge from the "pypi-diffoscope-experimental" branch of
https://github.com/lamby/jenkins.debian.net if that is more convenient.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
From b4c1a238cc160e9a03cab02ec9a8f84564d1b08e Mon Sep 17 00:00:00 2001
From: Chris Lamb <la...@debian.org>
Date: Sat, 18 Mar 2017 19:13:06 +0000
Subject: [PATCH 2/2] diffoscope_distribution_test.sh: Match distribution
exactly (eg. reject "buildd-experimental")
Signed-off-by: Chris Lamb <la...@debian.org>
---
bin/diffoscope_distribution_test.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/diffoscope_distribution_test.sh b/bin/diffoscope_distribution_test.sh
index 6a27a087..a80050da 100755
--- a/bin/diffoscope_distribution_test.sh
+++ b/bin/diffoscope_distribution_test.sh
@@ -69,7 +69,7 @@ check_whohas() {
#
for SUITE in 'experimental' 'unstable|sid'
do
- DIFFOSCOPE_IN_DEBIAN=$(rmadison diffoscope|egrep "${SUITE}"| awk '{print $3}' || true)
+ DIFFOSCOPE_IN_DEBIAN=$(rmadison diffoscope|egrep " ${SUITE} "| awk '{print $3}' || true)
if [ "$DIFFOSCOPE_IN_DEBIAN" != "" ] ; then
break
--
2.11.0
From 8760e9cf7965152e04d57e36eaee89e8752c7c92 Mon Sep 17 00:00:00 2001
From: Chris Lamb <la...@debian.org>
Date: Sat, 18 Mar 2017 19:12:28 +0000
Subject: [PATCH 1/2] diffoscope_distribution_test.sh: Prefer experimental over
unstable/sid when calculating "diffoscope in Debian" version.
Signed-off-by: Chris Lamb <la...@debian.org>
---
bin/diffoscope_distribution_test.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/bin/diffoscope_distribution_test.sh b/bin/diffoscope_distribution_test.sh
index a5808bec..6a27a087 100755
--- a/bin/diffoscope_distribution_test.sh
+++ b/bin/diffoscope_distribution_test.sh
@@ -67,7 +67,14 @@ check_whohas() {
#
# main
#
-DIFFOSCOPE_IN_DEBIAN=$(rmadison diffoscope|egrep '(unstable|sid)'| awk '{print $3}' || true)
+for SUITE in 'experimental' 'unstable|sid'
+do
+ DIFFOSCOPE_IN_DEBIAN=$(rmadison diffoscope|egrep "${SUITE}"| awk '{print $3}' || true)
+
+ if [ "$DIFFOSCOPE_IN_DEBIAN" != "" ] ; then
+ break
+ fi
+done
case $1 in
PyPI) check_pypi
--
2.11.0
_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
