summaryrefslogtreecommitdiff
path: root/Debian
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-01-06 00:39:29 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-01-06 00:44:42 +0000
commit2731b7cddb1f75f5895a9b5d3a3048ab269209df (patch)
tree0c224b441330ba62da713073cb1edfb499ccfc2d /Debian
parent37b5c1d305b5b7362e83ea4cbfdab4b9544031d3 (diff)
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 <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'Debian')
-rw-r--r--Debian/Dgit.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 458017d..2ef32f3 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)?";