Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.bugs.dist > #1019250 > unrolled thread

Bug#966256: reprotest: fails with diffoscope 153

Back to article view | Back to linux.debian.bugs.dist

Contents

  Bug#966256: reprotest: fails with diffoscope 153 gregor herrmann <gregoa@debian.org> - 2020-07-25 17:10 +0200
    Bug#966256: reprotest: fails with diffoscope 153 Vagrant Cascadian <vagrant@reproducible-builds.org> - 2020-07-26 05:20 +0200
      Bug#966256: reprotest: fails with diffoscope 153 gregor herrmann <gregoa@debian.org> - 2020-07-26 11:00 +0200
      Bug#966256: reprotest: fails with diffoscope 153 Holger Levsen <holger@layer-acht.org> - 2020-07-26 11:40 +0200

#1019250 — Bug#966256: reprotest: fails with diffoscope 153

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-----

[toc] | [next] | [standalone]

#1019312

[Multipart message — attachments visible in raw view] — view raw

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

[toc] | [prev] | [next] | [standalone]

#1019327

[Multipart message — attachments visible in raw view] — view raw

On Sat, 25 Jul 2020 20:07:53 -0700, Vagrant Cascadian wrote:

> > 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.

Thank you!
 
> 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.

Sounds good :)


Cheers,
gregor

-- 
 .''`.  https://info.comodo.priv.at -- Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
   `-   NP: Peter Ratzenbeck: Dadi

[toc] | [prev] | [next] | [standalone]

#1019334

[Multipart message — attachments visible in raw view] — view raw

On Sat, Jul 25, 2020 at 08:07:53PM -0700, Vagrant Cascadian wrote:
> 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.

I'm inclined to say that supporting pre-buster versions of diffoscope
is *less than ideal*...! ;)


-- 
cheers,
	Holger

-------------------------------------------------------------------------------
               holger@(debian|reproducible-builds|layer-acht).org
       PGP fingerprint: B8BF 5413 7B09 D35C F026 FE9D 091A B856 069A AA1C

[toc] | [prev] | [standalone]

Back to top | Article view | linux.debian.bugs.dist

csiph-web