Package: dgit
Version: 14.11
Debian tag2upload service writes ("[tag2upload 3044] irrecoverable sssd
2.12.0-3~exp0"):
> builder:work$ tag2upload-obtain-origs p=sssd 'v=2.12.0-3~exp0' s=experimental
> u=1a1cf163b78ff4768cc8bfc1e631171bc021e2fe
> + dgit --build-products-dir=../bpd -psssd download-unfetched-origs
> --write-sha256sums=../bpd/origs.sha256sums
> canonical suite name for experimental is rc-buggy
> package does not exist in target suite, looking in whole archive
> multiple possibilities for orig component orig:
> main: 5cef12b47fcb76f250bd9e00e5e5fea2df3b1ffc6d3d7e9ba1dbe753acac8880
> s/sssd/sssd_2.12.0.orig.tar.gz
> main: 7fb4458ad68e2e7f8d198a972abe8331a56af585d62a29875132fb169ec3ed84
> s/sssd/sssd_2.12.0.orig.tar.gz.asc
This output is nonsense. These are not two *alternative* origs.
They go together.
What tag2upload will often do in this situation is what it did in this
case:
> failed to resolve, unambiguously, which .origs are intended
> # conflicting orig(s) in archive, regenerating, hoping to reproduce a good one
> + git deborig 1a1cf163b78ff4768cc8bfc1e631171bc021e2fe
> # created orig
It has successfully reproduced sssd_2.12.0.orig.tar.gz. It therefore
concludes that sssd_2.12.0.orig.tar.gz is "the orig it ought to be
using" and disregards sssd_2.12.0.orig.tar.gz.asc because it's
"a different, alternative orig" (which is false).
In this case the upload failed for other reasons (d/s/local-options),
but I think if it hadn't been for that, it would have succeeded. The
.dsc and .changes might end up omitting the .asc, which is undesirable
but IMO tolerable. In some sense that's part of #1125133.
I think:
* The logic for handling competing orig sets should regard signature
files as being associated with the .orig they refer to.
(This will mean we need to soup up our filename patterns, too.)
* If dgit fetch and/or download-unfetched-origs doesn't download the
.asc, it should be changed to do do so.
* If dgit push-source doesn't include the .asc in the .dsc it should
be changed to do so.
(This applies to .sig files (and maybe others) too.)
Ian.
--
Ian Jackson <[email protected]> These opinions are my own.
Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.
