[Git][reproducible-builds/diffoscope][master] 2 commits: diffoscope/changes: Don't print GPG output.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
3350968f by Chris Lamb at 2018-09-10T17:48:21Z
diffoscope/changes: Don't print GPG output.

- - - - -
d57dba35 by Chris Lamb at 2018-09-10T18:05:48Z
Clarify distinction between tools (eg. gpg) and packages (eg. gnupg) when generating Debian substvars.

- - - - -


2 changed files:

- diffoscope/changes.py
- diffoscope/main.py


Changes:

=====================================
diffoscope/changes.py
=====================================
@@ -257,7 +257,6 @@ class Changes(object):
              self.get_changes_file()],
             shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         gpg_output, gpg_output_stderr = pipe.communicate()
-        print(gpg_output)
 
         if pipe.returncode != 0:
             raise ChangesFileException(
@@ -265,7 +264,6 @@ class Changes(object):
 
         # contains verbose human readable GPG information
         gpg_output_stderr = str(gpg_output_stderr, encoding='utf8')
-        print(gpg_output_stderr)
 
         gpg_output = gpg_output.decode(encoding='UTF-8')
 


=====================================
diffoscope/main.py
=====================================
@@ -334,10 +334,11 @@ class ListDebianSubstvarsAction(argparse._StoreTrueAction):
         # populated.
         ComparatorManager().reload()
 
-        tools = set()
-        for x in tool_required.all:
+        tools = tool_required.all
+        packages = set()
+        for x in tools:
             try:
-                tools.add(EXTERNAL_TOOLS[x]['debian'])
+                packages.add(EXTERNAL_TOOLS[x]['debian'])
             except KeyError:
                 pass
 
@@ -349,9 +350,9 @@ class ListDebianSubstvarsAction(argparse._StoreTrueAction):
             'diffutils',
             'findutils',
         ):
-            tools.discard(x)
+            packages.discard(x)
 
-        print('diffoscope:Recommends={}'.format(', '.join(sorted(tools))))
+        print('diffoscope:Recommends={}'.format(', '.join(sorted(packages))))
         sys.exit(0)
 
 



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/f29fdd9ef337296225790ccb7eb8bf2d75a33c8a...d57dba35eb8d39a130461ccfdd63a14be99ad40e

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/f29fdd9ef337296225790ccb7eb8bf2d75a33c8a...d57dba35eb8d39a130461ccfdd63a14be99ad40e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20180910/cbba3136/attachment.html>