diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-09-16 15:31:50 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-09-16 15:31:50 -0700 |
| commit | b773eefd1773bc2195f87f03721c89f7efb498f3 (patch) | |
| tree | b5e6e444b9f0786132a8f798bd6141878521cf7d /Debian/Dgit.pm | |
| parent | 1045e26443f21378d6fb98a46ace40c0d883cea6 (diff) | |
| parent | 896c94474922bc2698474c5ba57321fa61504238 (diff) | |
Merge tag 'debian/9.9' into buster-bpo
dgit release 9.9 for unstable (sid) [dgit]
[dgit distro=debian no-split]
# gpg: Signature made Sat 14 Sep 2019 01:35:57 PM MST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'Debian/Dgit.pm')
| -rw-r--r-- | Debian/Dgit.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 3ac042c..5d898ae 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -68,7 +68,8 @@ BEGIN { reflog_cache_insert reflog_cache_lookup $package_re $component_re $suite_re $deliberately_re $distro_re $versiontag_re $series_filename_re - $orig_f_comp_re $orig_f_sig_re $orig_f_tail_re + $orig_f_comp_re $orig_f_sig_re + $tarball_f_ext_re $orig_f_tail_re $extra_orig_namepart_re $git_null_obj $branchprefix @@ -107,7 +108,8 @@ our $series_filename_re = qr{(?:^|\.)series(?!\n)$}s; 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)?"; +our $tarball_f_ext_re = "\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?"; +our $orig_f_tail_re = "$orig_f_comp_re$tarball_f_ext_re"; our $git_null_obj = '0' x 40; our $ffq_refprefix = 'ffq-prev'; our $gdrlast_refprefix = 'debrebase-last'; |