From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 29 Jun 2019 17:11:52 +0000 (+0100)
Subject: dgit: import_tarball_tartrees: Handle @dfi==1 case in caller
X-Git-Tag: archive/debian/9.0~46
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=01dc2dbbdbab6744bb5ff340be60f3089f1a072c;p=dgit.git

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 0d31724b..33370619 100755
--- 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";