Bug#966256: reprotest: fails with diffoscope 153

[gregor herrmann]

Package: reprotest
Version: 0.7.14
Severity: important
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

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]
                  [--no-default-limits] [--text OUTPUT_FILE]
                  [--text-color WHEN] [--output-empty] [--html OUTPUT_FILE]
                  [--html-dir OUTPUT_DIR] [--css URL] [--jquery URL]
                  [--json OUTPUT_FILE] [--markdown OUTPUT_FILE]
                  [--restructured-text OUTPUT_FILE] [--difftool TOOL]
                  [--profile OUTPUT_FILE] [--max-text-report-size BYTES]
                  [--max-report-size BYTES] [--max-diff-block-lines LINES]
                  [--max-page-size BYTES] [--max-page-diff-block-lines LINES]
                  [--new-file] [--exclude GLOB_PATTERN]
                  [--exclude-command REGEX_PATTERN]
                  [--exclude-directory-metadata {auto,yes,no,recursive}]
                  [--diff-mask REGEX_PATTERN]
                  [--fuzzy-threshold FUZZY_THRESHOLD]
                  [--tool-prefix-binutils PREFIX]
                  [--max-diff-input-lines LINES] [--max-container-depth DEPTH]
                  [--max-diff-block-lines-saved LINES] [--use-dbgsym WHEN]
                  [--force-details] [--help] [--version]
                  [--list-tools [DISTRO]] [--list-debian-substvars]
                  [--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.)


Cheers,
gregor

-----BEGIN PGP SIGNATURE-----

iQKTBAEBCgB9FiEE0eExbpOnYKgQTYX6uzpoAYZJqgYFAl8cSCNfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEQx
RTEzMTZFOTNBNzYwQTgxMDREODVGQUJCM0E2ODAxODY0OUFBMDYACgkQuzpoAYZJ
qgZpmg/9FJsu+K56j1TmHjShmBEq//HVAO3W9maTOxcUyxoq4+bPoDdtEO2eIA3n
6NXe9G8P0vvKzcyOSsO3vMSrN1YeAJmode0zHqPJ8K3Bcut10Ryp5GBK4GF3g/XP
gPRZ15df4C99/4D06/FdTDFyNLzziCIJYgcDU+JqLsn2EW7mx911h/NSLbjyLFJP
/7dpJnEXaucvzO5PU2g+AFM7ymgFLi6XEJsO29MzAhVCpdQSr3B2gx+QdVsoSLTi
ozso3x1EVFd3AggM4487p4/8xvCDCgknL7GUD46buApe/wO1+guoFjNZQC0e26wF
W0l8fUcRsp2i/X3Ce6V7RV69lNJf41j2ut1HOKwxQ4WieZH1Y+dYVtbZjMojjSpn
0hjaoL6h0r6/7vZXNwPpTLLr0CUK7g6q6Nb6EYigEv1vOr4Kgo8eyLci55e5PFNM
HCGiAZMTLMIgYFRDrgTPCPAiV4wWznjG2xjxlxMourowWSD/feItFzCc/IsmR/TG
gztr288XFk1twE+gQy8jX1mAHgJyRytMs+77x+OG8hLzavq4JNrJ1Y/8GodRKRub
dgvkKkJ5Na0jHWdQgmVyQXeMimBva0r+O8glvcGLbFGDxZvrC9pIhty7igQDzJ9J
jbi3LuSKj9aMv0H/VyRx7Pco0lAMp8GZdy30ouG4s9vjc0cRXwM=
=3x8g
-----END PGP SIGNATURE-----