[devscripts] 01/01: scripts/reproducible-check: Handle multi-architecture systems. (Closes: #875887)

[Chris Lamb]

This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository devscripts.

commit 77064b0120ea4b1d701b9fc989701b1f19e7f643
Author: Chris Lamb <lamby at debian.org>
Date:   Sat Sep 16 18:34:19 2017 +0100

    scripts/reproducible-check: Handle multi-architecture systems. (Closes: #875887)
---
 scripts/reproducible-check | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/reproducible-check b/scripts/reproducible-check
index 6c8dab1..9b63760 100755
--- a/scripts/reproducible-check
+++ b/scripts/reproducible-check
@@ -144,6 +144,7 @@ class ReproducibleCheck(object):
     def output_by_source(self, unreproducible, installed):
         num_installed = sum(len(x) for x in installed.keys())
         num_unreproducible = sum(len(x) for x in unreproducible.keys())
+        default_architecture = apt.apt_pkg.config.find('APT::Architecture')
 
         for key, binaries in sorted(unreproducible.items()):
             source, architecture, version = key
@@ -151,8 +152,10 @@ class ReproducibleCheck(object):
             binaries_fmt = '({}) '.format(', '.join(binaries)) \
                 if binaries != [source] else ''
 
-            print("{} ({}) is unreproducible {}".format(
+            print("{}{} ({}) is unreproducible {}".format(
                 source,
+                '/{}'.format(architecture) \
+                    if architecture != default_architecture else '',
                 version,
                 binaries_fmt,
             ), end='')
@@ -165,7 +168,7 @@ class ReproducibleCheck(object):
         ))
 
     def output_raw(self, unreproducible, installed):
-        for x in sorted(x for xs in unreproducible.values() for x in xs):
+        for x in sorted(x for xs in set(unreproducible.values()) for x in xs):
             print(x)
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git