[Git][reproducible-builds/reprotest][master] Make diffoscope optional (Closes: #988964)

[Vagrant Cascadian (@vagrant)]

Vagrant Cascadian pushed to branch master at Reproducible Builds / reprotest


Commits:
7437776f by Vagrant Cascadian at 2021-07-15T14:55:34-07:00
Make diffoscope optional (Closes: #988964)

This allows diffoscope to really only be in Recommends.

- - - - -


2 changed files:

- reprotest/__init__.py
- setup.py


Changes:

=====================================
reprotest/__init__.py
=====================================
@@ -824,8 +824,11 @@ def run(argv, dry_run=None):
     diffoscope = parsed_args.diffoscope
     if parsed_args.no_diffoscope:
         diffoscope_args = None
-    else:
+    elif shutil.which('diffoscope'):
         diffoscope_args = [diffoscope] + diffoscope_args
+    else:
+        logger.warning("diffoscope not available, falling back to regular diff")
+        diffoscope_args = None
     control_build = parsed_args.control_build
 
     if not artifact_pattern:


=====================================
setup.py
=====================================
@@ -20,7 +20,6 @@ setup(name='reprotest',
               ],
           },
       install_requires=[
-          'diffoscope',
           'rstr',
           'distro',
           ],



View it on GitLab: https://salsa.debian.org/reproducible-builds/reprotest/-/commit/7437776ff63a4bf3f62dfd1165e2f8663da64199

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/reprotest/-/commit/7437776ff63a4bf3f62dfd1165e2f8663da64199
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/20210715/92d23952/attachment.htm>