[diffoscope] 01/01: Add missing Recommends for comparators. (Closes: #854655)

Chris Lamb chris at chris-lamb.co.uk
Thu Feb 9 04:54:45 CET 2017

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

lamby pushed a commit to branch master
in repository diffoscope.

commit 46d5003dfd3328eb399797b87d2d5b5aff930c42
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Feb 9 16:54:22 2017 +1300

    Add missing Recommends for comparators. (Closes: #854655)
    We ensure all comparators are imported so tool_required.all is populated;
    this was a regression introduced in 4cdfa577f090ca942db42127811937357ae7135
    as we no now lazily import our comparators.
    This is difficult to test due to 5362315ec73eb5f6183bad20afe50f698cfa91f4
    as we reload Comparators after every test so we are always in a consistent
    Signed-off-by: Chris Lamb <lamby at debian.org>
 diffoscope/main.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/diffoscope/main.py b/diffoscope/main.py
index 79c1337..a8f4dcf 100644
--- a/diffoscope/main.py
+++ b/diffoscope/main.py
@@ -35,6 +35,7 @@ from .progress import ProgressManager, Progress
 from .profiling import ProfileManager, profile
 from .tempfiles import clean_all_temp_files
 from .difference import Difference
+from .comparators import ComparatorManager
 from .external_tools import EXTERNAL_TOOLS
 from .presenters.html import JQUERY_SYSTEM_LOCATIONS
 from .presenters.formats import output_all
@@ -203,6 +204,10 @@ class RangeCompleter(object):
 class ListToolsAction(argparse.Action):
     def __call__(self, parser, namespace, os_override, option_string=None):
+        # Ensure all comparators are imported so tool_required.all is
+        # populated.
+        ComparatorManager().reload()
         print("External-Tools-Required: ", end='')
         print(', '.join(sorted(tool_required.all)))
         if os_override:

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

More information about the diffoscope mailing list