dgit: import_tarball_tartrees: Provide OrigPart

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 4844bfce36e0c3b3343da3fc907b7e4310760609..73b88ad593616e086fda2736b1e9e96bde0a0fcc 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2290,7 +2290,6 @@ sub import_tarball_tartrees ($$) {
 
        my $f = $fi->{Filename};
        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;
@@ -2302,6 +2301,7 @@ sub import_tarball_tartrees ($$) {
                          $compr_ext, $orig_f_part
                         ), "\n";
 
+       my $path = $fi->{Path} // $f;
        my $input = new IO::File $f, '<' or die "$f $!";
        my $compr_pid;
        my @compr_cmd;
@@ -2367,6 +2367,7 @@ sub import_tarball_tartrees ($$) {
             Sort => (!$orig_f_part         ? 2 :
                     $orig_f_part =~ m/-/g ? 1 :
                                             0),
+            OrigPart => $orig_f_part, # 'orig', 'orig-XXX', or undef 
             F => $f,
             Tree => $tree,
         };
@@ -2535,7 +2536,9 @@ sub generate_commits_from_dsc () {
        }
     }
 
-    my @tartrees = import_tarball_tartrees($upstreamv, \@dfi);
+    my @tartrees;
+    @tartrees = import_tarball_tartrees($upstreamv, \@dfi)
+       unless @dfi == 1; # only one file in .dsc
 
     my $dscfn = "$package.dsc";