From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 18 Aug 2015 14:15:15 +0000 (+0100)
Subject: Unbreak --dry-run (`exiting subroutine via next', broken in ac221d67, bug released... 
X-Git-Tag: debian/1.4~24
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0f8af6bb8e37dc0fc36b327146082bd2b4363195

Unbreak --dry-run (`exiting subroutine via next', broken in ac221d67, bug released in 0.22).
---

diff --git a/debian/changelog b/debian/changelog
index 1aedb32c..886ab3bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (1.4~~) UNRELEASED; urgency=low
 
-  * 
+  * Unbreak --dry-run (`exiting subroutine via next', broken in
+    ac221d67, bug released in 0.22).
 
  --
 
diff --git a/dgit b/dgit
index 60b39e4a..8f0052bf 100755
--- a/dgit
+++ b/dgit
@@ -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;
     }
 }