dgit: import_tarball_tartrees: Handle @dfi==1 case in caller

We are going to introduce a caller which doesn't want this check.

No overall functional change other than to debugging output.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/dgit b/dgit
index 0d31724b549a8b2e803460239158808f668dd850..33370619cd2f12d277e7475a8fd9154049c47ede 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;
@@ -2536,7 +2535,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";