[diffoscope] 01/01: comparators.Debian: Show results from debugging packages last (Closes: #820427)

[Chris Lamb]

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

lamby pushed a commit to branch master
in repository diffoscope.

commit 62b3900ff9a873bdaa86a95e2d129ac6d5f0b283
Author: Chris Lamb <lamby at debian.org>
Date:   Tue Feb 7 22:01:51 2017 +1300

    comparators.Debian: Show results from debugging packages last (Closes: #820427)
    
    Signed-off-by: Chris Lamb <lamby at debian.org>
---
 diffoscope/comparators/debian.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/diffoscope/comparators/debian.py b/diffoscope/comparators/debian.py
index a6c9da7..dc182db 100644
--- a/diffoscope/comparators/debian.py
+++ b/diffoscope/comparators/debian.py
@@ -97,7 +97,13 @@ class DebControlContainer(Container):
         field = self.source.deb822.get('Files') or \
             self.source.deb822.get('Checksums-Sha256')
 
-        return [x['name'] for x in field]
+        # Show results from debugging packages last; they are rather verbose,
+        # masking other more interesting differences due to truncating the
+        # output.
+        return sorted(
+            (x['name'] for x in field),
+            key=lambda x: (x.endswith('.deb') and '-dbgsym_' in x, x),
+        )
 
     def get_member(self, member_name):
         return DebControlMember(self, member_name)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git