dgit: complete_file_from_dsc: Reorganise $fetchhash

No functional change.

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

1 files changed, 7 insertions, 6 deletions

diff --git a/dgit b/dgit
index 39d439d..c801fa9 100755
--- a/dgit
+++ b/dgit
@@ -2465,17 +2465,14 @@ sub complete_file_from_dsc ($$) {
     my $tf = "$dstdir/$f";
     my $downloaded = 0;
 
+    my $got;
     my $checkhash = sub {
 	open F, "<", "$tf" or die "$tf: $!";
 	$fi->{Digester}->reset();
 	$fi->{Digester}->addfile(*F);
 	F->error and die $!;
 	my $got = $fi->{Digester}->hexdigest();
-	$got eq $fi->{Hash} or
-	    fail "file $f has hash $got but .dsc".
-		" demands hash $fi->{Hash} ".
-		($downloaded ? "(got wrong file from archive!)"
-		 : "(perhaps you should delete this file?)");
+	return $got eq $fi->{Hash};
     };
 
     if (stat_exists $tf) {
@@ -2492,7 +2489,11 @@ sub complete_file_from_dsc ($$) {
 	$downloaded = 1;
     }
 
-    $checkhash->();
+    $checkhash->() or
+	fail "file $f has hash $got but .dsc".
+	    " demands hash $fi->{Hash} ".
+	    ($downloaded ? "(got wrong file from archive!)"
+	     : "(perhaps you should delete this file?)");
 
     return 1;
 }