diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-29 18:11:52 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-30 21:11:17 +0100 |
commit | 01dc2dbbdbab6744bb5ff340be60f3089f1a072c (patch) | |
tree | ade324dead424df2ac39843ebd21e9c179bdf890 /dgit | |
parent | a1d908d84d83f9e8ec1363002b3339f96a0c10b9 (diff) |
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>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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"; |