X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Debian%2FDgit.pm;h=5d898ae5f6ab1c33e1f2f043d5c684bd1fe5005b;hb=0e6b4849c4a26631f70c6537d016c5da10e1ec1c;hp=3ac042cdd3052831aa611f006f72b04a8b51c609;hpb=1db4fd4c84de73ea00617e281335ec23a70aa1d0;p=dgit.git diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 3ac042cd..5d898ae5 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';