Bug#908814: origtargz: handle .asc upstream signatures
Le 01/07/2020 à 17:04, Mattia Rizzolo a écrit :
> On Wed, Jul 01, 2020 at 04:34:32PM +0200, Xavier wrote:
>> --- a/scripts/origtargz.pl
>> +++ b/scripts/origtargz.pl
>> @@ -343,6 +343,7 @@ sub unpack_tarball (@) {
>>
>> for my $origtar (@origtar) {
>> my $tmpdir = File::Temp->newdir(DIR => ".", CLEANUP => 1);
>> +next if $origtar =~ /\.(?:asc|sig)$/;
>> print "Unpacking $origtar\n";
>> my $cmp = ($origtar =~ /orig(?:-([\w\-]+))?\.tar/)[0] || '';
>> if ($cmp) {
>
>
> Mh, but I doubt it does what this bug is about: it should *extract* the
> .asc files from pristine-tar if they matches the version. I suppose it
> needs to somehow check whether the .asc is present and if it pass it via
> the -s option of `pristine-tar checkout` (at line 255).
>
> Perhaps indeed we also need this bit you proposed, though I admit I
> never used --unpack :D
In a previous comment, the bug was related to --path option (which
currently fail with a .asc file since it tries to extract it)
Bug#908814: origtargz: handle .asc upstream signatures
On Wed, Jul 01, 2020 at 04:34:32PM +0200, Xavier wrote:
> --- a/scripts/origtargz.pl
> +++ b/scripts/origtargz.pl
> @@ -343,6 +343,7 @@ sub unpack_tarball (@) {
>
> for my $origtar (@origtar) {
> my $tmpdir = File::Temp->newdir(DIR => ".", CLEANUP => 1);
> +next if $origtar =~ /\.(?:asc|sig)$/;
> print "Unpacking $origtar\n";
> my $cmp = ($origtar =~ /orig(?:-([\w\-]+))?\.tar/)[0] || '';
> if ($cmp) {
Mh, but I doubt it does what this bug is about: it should *extract* the
.asc files from pristine-tar if they matches the version. I suppose it
needs to somehow check whether the .asc is present and if it pass it via
the -s option of `pristine-tar checkout` (at line 255).
Perhaps indeed we also need this bit you proposed, though I admit I
never used --unpack :D
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
More about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
signature.asc
Description: PGP signature
Bug#908814: origtargz: handle .asc upstream signatures
Hi,
this seems enough to fix the bug:
--- a/scripts/origtargz.pl
+++ b/scripts/origtargz.pl
@@ -343,6 +343,7 @@ sub unpack_tarball (@) {
for my $origtar (@origtar) {
my $tmpdir = File::Temp->newdir(DIR => ".", CLEANUP => 1);
+next if $origtar =~ /\.(?:asc|sig)$/;
print "Unpacking $origtar\n";
my $cmp = ($origtar =~ /orig(?:-([\w\-]+))?\.tar/)[0] || '';
if ($cmp) {
Bug#908814: origtargz: handle .asc upstream signatures
Control: owner -1 ! Re: Mattia Rizzolo 2018-09-18 <20180918141205.gn16...@mapreri.org> > > When fetching upstream .orig.tar.* files, origtargz should also look > > for .asc files. > > Are you referring to pristine-tar here? > > origtargz has 4 modes of operation: > * tarball already present → do nothing (and I suppose this is not the >one you are thinking about) There's a sub-mode where it copies the .tar file from elsewhere on the filesystem (--path). That's the one that bit me. > * pristne-tar → which indeed would not take out the .asc if it's >committed. However the -s flag was added very recently to >pristine-tar so I'm not sure if you even knew of this option... Thanks for the pointer. Christoph -- Senior Berater, Tel.: +49 2166 9901 187 credativ GmbH, HRB Mönchengladbach 12080, USt-ID-Nummer: DE204566209 Trompeterallee 108, 41189 Mönchengladbach Geschäftsführung: Dr. Michael Meskes, Jörg Folz, Sascha Heuer Datenschutzerklärung: https://www.credativ.de/datenschutz
Bug#908814: origtargz: handle .asc upstream signatures
user devscri...@packages.debian.org usertag 908814 origtargz tag 908814 moreinfo done On Fri, Sep 14, 2018 at 11:57:43AM +0200, Christoph Berg wrote: > When fetching upstream .orig.tar.* files, origtargz should also look > for .asc files. Are you referring to pristine-tar here? origtargz has 4 modes of operation: * tarball already present → do nothing (and I suppose this is not the one you are thinking about) * pristne-tar → which indeed would not take out the .asc if it's committed. However the -s flag was added very recently to pristine-tar so I'm not sure if you even knew of this option... * apt-get source → which just runs apt-get source so I'd be suprised if it didn't also download the .asc * uscan → which really does dowload the .asc if one is present and d/watch matches -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. more about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `- signature.asc Description: PGP signature
Bug#908814: origtargz: handle .asc upstream signatures
Package: devscripts Version: 2.18.4 Severity: normal When fetching upstream .orig.tar.* files, origtargz should also look for .asc files. Christoph
