[diffoscope] 03/04: Revert "Change internal archive content names."

Maria Glukhova siamezzze-guest at moszumanska.debian.org
Sat Jan 21 17:07:31 CET 2017


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 49110ebe57f99341f5c72f4506d8bd0f31f8743a
Author: Maria Glukhova <siamezzze at gmail.com>
Date:   Fri Jan 20 23:08:09 2017 +0200

    Revert "Change internal archive content names."
    
    If we add fuzzy-matching across containers, different internal names
    would not matter much.
    This reverts commit 176f7abf59c20e1fb0a64d181bc618aed7164255.
---
 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 d5c24ca..e54b28b 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({'archive-content': self.get_member(self.get_member_names()[0])})
+        return collections.OrderedDict({'bzip2-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 5ca3fc7..f81bac5 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({'archive-content': self.get_member(self.get_member_names()[0])})
+        return collections.OrderedDict({'gzip-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 928fe46..d75853a 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({'archive-content': self.get_member(self.get_member_names()[0])})
+        return collections.OrderedDict({'xz-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


More information about the diffoscope mailing list