Commit d57dba35 authored by Chris Lamb's avatar Chris Lamb

Clarify distinction between tools (eg. gpg) and packages (eg. gnupg) when…

Clarify distinction between tools (eg. gpg) and packages (eg. gnupg) when generating Debian substvars.
parent 3350968f
Pipeline #18692 failed with stage
in 3 minutes and 37 seconds
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment