[Git][reproducible-builds/reprotest][master] Update default arguments passed to diffoscope to support diffoscope

[Vagrant Cascadian]

Vagrant Cascadian pushed to branch master at Reproducible Builds / reprotest


Commits:
c17411af by Vagrant Cascadian at 2020-07-25T18:46:54-07:00
Update default arguments passed to diffoscope to support diffoscope
version 153+. (Closes: #966256). Big thanks to Gregor Herrmann!

- - - - -


3 changed files:

- README.rst
- debian/control
- reprotest/__init__.py


Changes:

=====================================
README.rst
=====================================
@@ -203,9 +203,9 @@ the other hand, (2) when running something like `make install`, we *do* care
 about the metadata, because this is what will be recreated on another system.
 
 In developing reprotest, our experience has been that case (1) is more common
-and so we pass ``--exclude-directory-metadata`` by default to diffoscope. If
+and so we pass ``--exclude-directory-metadata=yes`` by default to diffoscope. If
 you find that you are using reprotest for case (2) then you should pass
-``--diffoscope-args=--no-exclude-directory-metadata`` to reprotest, to tell
+``--diffoscope-args=--exclude-directory-metadata=no`` to reprotest, to tell
 diffoscope to not ignore the metadata since it will be distributed and should
 therefore be reproducible. Otherwise, you may get a false-positive result.
 


=====================================
debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends:
  help2man <!nodoc>,
  python3-docutils <!nodoc>,
 # tests.py uses dpkg-buildpackage which uses lintian
- diffoscope <!nocheck>,
+ diffoscope (>= 153~) <!nocheck>,
  faketime <!nocheck>,
  lintian <!nocheck>,
  locales-all <!nocheck>,
@@ -40,7 +40,7 @@ Depends: ${python3:Depends},
  python3-rstr,
  ${misc:Depends}
 Recommends:
- diffoscope,
+ diffoscope (>= 153~),
  disorderfs,
  faketime,
  locales-all,


=====================================
reprotest/__init__.py
=====================================
@@ -605,7 +605,7 @@ def cli_parser():
         help='Give extra arguments to diffoscope when running it. Default: '
         '%(default)s. Arguments are {}-formatted with: {0} the name of each '
         'experiment run, and {1} the path of the experiment output.',
-        default=['--exclude-directory-metadata'])
+        default=['--exclude-directory-metadata=yes'])
     group2.add_argument('--diffoscope', default='diffoscope', metavar='PATH',
         help='Path to diffoscope(1). Default: %(default)s')
     group2.add_argument('--no-diffoscope', action='store_true', default=False,



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/reprotest/-/commit/c17411af610582935b401845610a3738e3971218
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/20200726/9e83a9f8/attachment.htm>