[diffoscope] 02/02: Change internal archive content names.

[Maria Glukhova]

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

siamezzze-guest pushed a commit to branch siamezzze/containers
in repository diffoscope.

commit 176f7abf59c20e1fb0a64d181bc618aed7164255
Author: Maria Glukhova <siamezzze at gmail.com>
Date:   Fri Jan 20 06:34:49 2017 +0200

    Change internal archive content names.
    
    Make gz, bz2 and xz comparators give the same internal names to their content, so they get compared in the cross-container comparison case (otherwise, they are trated like different files and don't get compared).
---
 diffoscope/comparators/bzip2.py | 2 +-
 diffoscope/comparators/gzip.py  | 2 +-
 diffoscope/comparators/xz.py    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/diffoscope/comparators/bzip2.py b/diffoscope/comparators/bzip2.py
index e54b28b..d5c24ca 100644
--- a/diffoscope/comparators/bzip2.py
+++ b/diffoscope/comparators/bzip2.py
@@ -40,7 +40,7 @@ class Bzip2Container(Archive):
         pass
 
     def get_members(self):
-        return collections.OrderedDict({'bzip2-content': self.get_member(self.get_member_names()[0])})
+        return collections.OrderedDict({'archive-content': self.get_member(self.get_member_names()[0])})
 
     def get_member_names(self):
         return [get_compressed_content_name(self.source.path, '.bz2')]
diff --git a/diffoscope/comparators/gzip.py b/diffoscope/comparators/gzip.py
index f81bac5..5ca3fc7 100644
--- a/diffoscope/comparators/gzip.py
+++ b/diffoscope/comparators/gzip.py
@@ -42,7 +42,7 @@ class GzipContainer(Archive):
         pass
 
     def get_members(self):
-        return collections.OrderedDict({'gzip-content': self.get_member(self.get_member_names()[0])})
+        return collections.OrderedDict({'archive-content': self.get_member(self.get_member_names()[0])})
 
     def get_member_names(self):
         return [get_compressed_content_name(self.source.path, '.gz')]
diff --git a/diffoscope/comparators/xz.py b/diffoscope/comparators/xz.py
index d75853a..928fe46 100644
--- a/diffoscope/comparators/xz.py
+++ b/diffoscope/comparators/xz.py
@@ -40,7 +40,7 @@ class XzContainer(Archive):
         pass
 
     def get_members(self):
-        return collections.OrderedDict({'xz-content': self.get_member(self.get_member_names()[0])})
+        return collections.OrderedDict({'archive-content': self.get_member(self.get_member_names()[0])})
 
     def get_member_names(self):
         return [get_compressed_content_name(self.source.path, '.xz')]

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