Import: orig files: cope with signatures

[dgit.git] / dgit

diff --git a/dgit b/dgit
index e11d2fb5b8014c885474e5badb18d8a857cfb593..e05c57436d7f06d9c6f298d5039436e4d1544601 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -78,7 +78,8 @@ our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 our $suite_re = '[-+.0-9a-z]+';
 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
-our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?";
+our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
+our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
 
 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
 our $splitbraincache = 'dgit-intern/quilt-cache';
@@ -1593,6 +1594,7 @@ sub generate_commits_from_dsc () {
        printdebug "import considering $f ";
        (printdebug "only one dfi\n"), next if @dfi == 1;
        (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
+       (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
        my $compr_ext = $1;
 
        my ($orig_f_part) =