[diffoscope] 01/01: Prevent a traceback when using --new-file with containers by passing progress_name of the Member and not the member itself. (Closes: #861286)

Chris Lamb chris at chris-lamb.co.uk
Thu Apr 27 08:34:01 CEST 2017


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

lamby pushed a commit to branch experimental
in repository diffoscope.

commit caad6d1c912b32084c00042be0f7c0e6444976c0
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Apr 27 08:31:27 2017 +0200

    Prevent a traceback when using --new-file with containers by passing progress_name of the Member and not the member itself. (Closes: #861286)
    
    Signed-off-by: Chris Lamb <lamby at debian.org>
---
 diffoscope/comparators/utils/container.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/diffoscope/comparators/utils/container.py b/diffoscope/comparators/utils/container.py
index 4e23466..57fb10a 100644
--- a/diffoscope/comparators/utils/container.py
+++ b/diffoscope/comparators/utils/container.py
@@ -120,11 +120,11 @@ class Container(object, metaclass=abc.ABCMeta):
 
             if Config().new_file:
                 for my_member in my_members.values():
-                    p.step(msg=my_member)
+                    p.step(msg=my_member.progress_name)
                     yield my_member, MissingFile('/dev/null', my_member), NO_COMMENT
 
                 for other_member in other_members.values():
-                    p.step(msg=other_member)
+                    p.step(msg=other_member.progress_name)
                     yield MissingFile('/dev/null', other_member), other_member, NO_COMMENT
 
     def compare(self, other, source=None):

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


More information about the diffoscope mailing list