Control: tags 988964 +patch On 2021-05-25, Mattia Rizzolo wrote: > On Fri, May 21, 2021 at 05:33:42PM -0700, Vagrant Cascadian wrote: >> > Yes, just confirmed that it gets added through python3:Depends. >> > >> > So, I presume it will require mangling python3:Depends, or adjusting the >> > code to convince the pybuild/dh_python/etc that it doesn't belong there. >> >> diffoscope is in install_requires, removing it gets it out of >> python3:Depends, but may have other unintended consequences: > > Yes, currently diffoscope is run unconditionally unless --no-diffoscope > is passed. which means that it need to learn to check before running it > :)
How about this not really at all tested patch:
diff --git a/reprotest/__init__.py b/reprotest/__init__.py
index 6fd159a..f8ba450 100644
--- a/reprotest/__init__.py
+++ b/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:
Will try to test it soon...
live well,
vagrant
signature.asc
Description: PGP signature
_______________________________________________ Reproducible-builds mailing list Reproducible-builds@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/reproducible-builds
