[Reproducible-commits] [debbindiff] 01/01: Use numeric uid/gid when listing cpio content

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository debbindiff.

commit d13c619cf5e63c350fa49717867defe953159c88
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Jul 30 09:16:50 2015 +0000

    Use numeric uid/gid when listing cpio content
    
    cpio actually stores uid/gid in numeric form. This means the listing
    output used to be different from one system to the next. As this could
    hide differences, let's just display the numbers instead.
---
 debbindiff/comparators/cpio.py        |  2 +-
 tests/data/cpio_listing_expected_diff | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debbindiff/comparators/cpio.py b/debbindiff/comparators/cpio.py
index 46bc196..f37d23c 100644
--- a/debbindiff/comparators/cpio.py
+++ b/debbindiff/comparators/cpio.py
@@ -32,7 +32,7 @@ from debbindiff.difference import Difference
 class CpioContent(Command):
     @tool_required('cpio')
     def cmdline(self):
-        return ['cpio', '--quiet', '-tvF', self.path]
+        return ['cpio', '--quiet', '--numeric-uid-gid', '-tvF', self.path]
 
 
 class CpioFile(File):
diff --git a/tests/data/cpio_listing_expected_diff b/tests/data/cpio_listing_expected_diff
index 8b9be77..c97fd5e 100644
--- a/tests/data/cpio_listing_expected_diff
+++ b/tests/data/cpio_listing_expected_diff
@@ -1,8 +1,8 @@
 @@ -1,4 +1,4 @@
--lrwxrwxrwx   1 lunar    lunar           6 Jun 24 15:10 dir/link -> broken
-+lrwxrwxrwx   1 lunar    lunar          13 Jun 24 15:11 dir/link -> really-broken
- crw-r--r--   1 root     root       1,   3 Jun 24 14:47 dir/null
---rw-r--r--   1 lunar    lunar         446 Jun 24 15:10 dir/text
--drwxr-xr-x   2 lunar    lunar           0 Jun 24 15:10 dir
-+-rw-r--r--   1 lunar    lunar         671 Jun 24 15:11 dir/text
-+drwxr-xr-x   2 lunar    lunar           0 Jun 24 15:11 dir
+-lrwxrwxrwx   1 1000     1000            6 Jun 24 15:10 dir/link -> broken
++lrwxrwxrwx   1 1000     1000           13 Jun 24 15:11 dir/link -> really-broken
+ crw-r--r--   1 0        0          1,   3 Jun 24 14:47 dir/null
+--rw-r--r--   1 1000     1000          446 Jun 24 15:10 dir/text
+-drwxr-xr-x   2 1000     1000            0 Jun 24 15:10 dir
++-rw-r--r--   1 1000     1000          671 Jun 24 15:11 dir/text
++drwxr-xr-x   2 1000     1000            0 Jun 24 15:11 dir

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