diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-08-18 15:15:15 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-08-18 15:15:15 +0100 |
commit | 0f8af6bb8e37dc0fc36b327146082bd2b4363195 (patch) | |
tree | f1ec41ec0d531a80a23688a446cac21c3e821cda /dgit | |
parent | 548098b44ad3f84fd0a8a18ec2e9386f306021dc (diff) |
Unbreak --dry-run (`exiting subroutine via next', broken in ac221d67, bug released in 0.22).
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -1386,7 +1386,8 @@ sub generate_commit_from_dsc () { or $!==&ENOENT or die "$f $!"; - complete_file_from_dsc('.', $fi); + complete_file_from_dsc('.', $fi) + or next; if (is_orig_file($f)) { link $f, "../../../../$f" @@ -1484,7 +1485,7 @@ sub complete_file_from_dsc ($$) { die "$f ?" unless $f =~ m/^\Q${package}\E_/; die "$f ?" if $f =~ m#/#; runcmd_ordryrun_local @curl,qw(-o),$tf,'--',"$furl"; - next if !act_local(); + return 0 if !act_local(); $downloaded = 1; } @@ -1498,13 +1499,16 @@ sub complete_file_from_dsc ($$) { " demands hash $fi->{Hash} ". ($downloaded ? "(got wrong file from archive!)" : "(perhaps you should delete this file?)"); + + return 1; } sub ensure_we_have_orig () { foreach my $fi (dsc_files_info()) { my $f = $fi->{Filename}; next unless is_orig_file($f); - complete_file_from_dsc('..', $fi); + complete_file_from_dsc('..', $fi) + or next; } } |