Bug#966256: reprotest: fails with diffoscope 153

[Vagrant Cascadian]

On 2020-07-25, gregor herrmann wrote:
> After upgrading diffoscope to version 153, reprotest fails with
>
> INFO:reprotest:Running diffoscope: ['diffoscope', '--exclude-directory-metadata', '/tmp/tmp7evaur28/control', '/tmp/tmp7evaur28/experiment-1']
> usage: diffoscope [--debug] [--pdb] [--status-fd FD] [--progress]
...
>                   [--list-missing-tools [DISTRO]]
>                   path1 [path2]
> diffoscope: error: argument --exclude-directory-metadata: invalid choice: '/tmp/tmp7evaur28/control' (choose from 'auto', 'yes', 'no', 'recursive')
>
>
> And diffoscope's d/changelog says:
>
>   * Drop some legacy argument styles; --exclude-directory-metadata and
>     --no-exclude-directory-metadata have been replaced with
>     --exclude-directory-metadata={yes,no}.
>
>
> So changing '--exclude-directory-metadata' to
> '--exclude-directory-metadata=yes' seems to be the way to go.
> (And monkey-patching =yes into
> /usr/lib/python3/dist-packages/reprotest/__init__.py, line 608 seems
> to work indeed.)

Thanks! I've tested and pushed a trivial fix based on the above.

Ideally it could check the version of diffoscope used and pass the
appropriate argument...

On closer look, the --exclude-directory-metadata=yes|no syntax was
introduced in 112 (present in buster at least), so it might be ok to
just assume a "new" version of diffoscope, though there is currently no
way to override this argument being passed.


live well,
  vagrant
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/reproducible-builds/attachments/20200725/d2ef82cd/attachment.sig>