Control: tags -1 patch
peter green writes ("Bug#916926: dgit: quit fixup fails with secondary orig
tarballs and mode 755 files."):
> Steps to reproduce:
>
> dget
> http://deb.debian.org/debian/pool/main/f/firefox-esr/firefox-esr_60.4.0esr-1.dsc
> mkdir tempgit
> cd tempgit
> git init
> dgit import-dsc ../firefox-esr_60.4.0esr-1.dsc workingbranch
> git checkout workingbranch
> dgit -wgf --quilt=auto quilt-fixup
Thank you for the steps to reproduce. They allowed me to (after
making several Gby of free disk space!) fairly quickly reproduce
this.
I have fixed it. Patch is attached and should be in buster.
Regards,
Ian.
>From 1bb63a1b915cdd2620e16aa88e73ca2ef901a11b Mon Sep 17 00:00:00 2001
From: Ian Jackson <[email protected]>
Date: Sun, 6 Jan 2019 00:39:29 +0000
Subject: [PATCH] Dgit.pm: Allow uppercase (ascii) letters in multi-orig
components
We didn't recognise files like
firefox-esr_60.4.0esr.orig-l10n-sv-SE.tar.bz2
as orig files. As a result, dgit would see all the things in the
corresponding subdirectory as having been added in Debian changes,
leading it making inaccurate complaints and bombing out.
See also #918438 against policy, where I (effectively) argue that this
is a design error in the `3.0 (quilt)' format.
Closes: #916926
Signed-off-by: Ian Jackson <[email protected]>
---
Debian/Dgit.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 458017df..2ef32f32 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -98,7 +98,7 @@ our $distro_re = $component_re;
our $versiontag_re = qr{[-+.\%_0-9a-zA-Z/]+};
our $branchprefix = 'dgit';
our $series_filename_re = qr{(?:^|\.)series(?!\n)$}s;
-our $extra_orig_namepart_re = qr{[-0-9a-z]+};
+our $extra_orig_namepart_re = qr{[-0-9a-zA-Z]+};
our $orig_f_comp_re = qr{orig(?:-$extra_orig_namepart_re)?};
our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
--
2.11.0
--
Ian Jackson <[email protected]> These opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
