Hi!
On Sat, 2016-04-23 at 15:05:51 +0200, Guillem Jover wrote:
> On Tue, 2016-04-12 at 10:49:26 +0200, Ansgar Burchardt wrote:
> > Guillem Jover <guil...@debian.org> writes:
> > > I've tried uploading libmd with detached signatures and unfortunately
> > > this patch was not enough. Attached an untested patch series hopefully
> > > fixing all current issues. But please review and test!
> >
> > Sorry, I lost track of this and forgot about your mail. The topic came
> > up in a different place and made me check on the current state where I
> > discovered your unapplied patches :/
>
> No problem!
>
> > They are applied now, though I didn't test uploading a detached
> > signature yet. But at least they didn't break other uploads.
>
> I just tested this now, and I'm still getting a rejection:
>
> ,---
> libbsd_0.8.3-1.dsc: lists multiple orig_tar
> `---
>
> Checking the code it seems the problem comes from the regexes not
> being anchored at the end, and me adding the more specific regexes
> after the more general ones. The attached patch should in principle
> fix that one. But there might still be other problems lurking. :)
> Let's see with this next iteration.
Hmm, and the commit message has a wrong commit reference. Fixed with
the attached one.
Thanks,
Guillem
From 7b7819f9a21ff2b3daf45f2077b1026a250cc1ab Mon Sep 17 00:00:00 2001
From: Guillem Jover <guil...@debian.org>
Date: Sat, 23 Apr 2016 14:02:16 +0200
Subject: [PATCH] Move more specific source file regexes before general ones
The orig tarball regexes match also the orig tarball detached
signatures because they are not anchored at the end, and the loop
short-circuits on first match. So we have to move them before their
more general counterparts.
Fixes commit 84f230b6cfb4b3eb1ef5fbe672e121b1a8e7aabb.
---
daklib/utils.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daklib/utils.py b/daklib/utils.py
index ce72a2c..206ee0b 100644
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -315,11 +315,11 @@ def check_dsc_files(dsc_filename, dsc, dsc_files):
(r'diff\.gz', ('debian_diff',)),
(r'tar\.gz', ('native_tar_gz', 'native_tar')),
(r'debian\.tar\.(gz|bz2|xz)', ('debian_tar',)),
- (r'orig\.tar\.(gz|bz2|xz)', ('orig_tar',)),
(r'orig\.tar\.(gz|bz2|xz)\.asc', ('orig_tar_sig',)),
+ (r'orig\.tar\.(gz|bz2|xz)', ('orig_tar',)),
(r'tar\.(gz|bz2|xz)', ('native_tar',)),
- (r'orig-.+\.tar\.(gz|bz2|xz)', ('more_orig_tar',)),
(r'orig-.+\.tar\.(gz|bz2|xz)\.asc', ('more_orig_tar_sig',)),
+ (r'orig-.+\.tar\.(gz|bz2|xz)', ('more_orig_tar',)),
)
for f in dsc_files:
--
2.8.1
