From 54eabf5833c128f7158550c37e4fef9c4d5ef846 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 10 Jan 2017 14:34:08 +0000
Subject: [PATCH] dgit: complete_file_from_dsc: Introduce $refetched

Make have a option which, if set, causes hash mismatches to result in
a refetch rather than a crash.

No functional change because no call sites pass it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/dgit b/dgit
index c801fa93..0cd122ef 100755
--- a/dgit
+++ b/dgit
@@ -2456,10 +2456,12 @@ END
     return @output;
 }
 
-sub complete_file_from_dsc ($$) {
-    our ($dstdir, $fi) = @_;
-    # Ensures that we have, in $dir, the file $fi, with the correct
+sub complete_file_from_dsc ($$;$) {
+    our ($dstdir, $fi, $refetched) = @_;
+    # Ensures that we have, in $dstdir, the file $fi, with the correct
     # contents.  (Downloading it from alongside $dscurl if necessary.)
+    # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
+    # and will set $$refetched=1 if it did so (or tried to).
 
     my $f = $fi->{Filename};
     my $tf = "$dstdir/$f";
@@ -2476,24 +2478,34 @@ sub complete_file_from_dsc ($$) {
     };
 
     if (stat_exists $tf) {
-	progress "using existing $f";
+	if ($checkhash->()) {
+	    progress "using existing $f";
+	    return 1;
+	}
+	if (!$refetched) {
+	    fail "file $f has hash $got but .dsc".
+		" demands hash $fi->{Hash} ".
+		"(perhaps you should delete this file?)";
+	}
+	progress "need to fetch correct version of $f";
+	unlink $tf or die "$tf $!";
+	$$refetched = 1;
     } else {
 	printdebug "$tf does not exist, need to fetch\n";
-	my $furl = $dscurl;
-	$furl =~ s{/[^/]+$}{};
-	$furl .= "/$f";
-	die "$f ?" unless $f =~ m/^\Q${package}\E_/;
-	die "$f ?" if $f =~ m#/#;
-	runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
-	return 0 if !act_local();
-	$downloaded = 1;
     }
 
+    my $furl = $dscurl;
+    $furl =~ s{/[^/]+$}{};
+    $furl .= "/$f";
+    die "$f ?" unless $f =~ m/^\Q${package}\E_/;
+    die "$f ?" if $f =~ m#/#;
+    runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
+    return 0 if !act_local();
+
     $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?)");
+	    "(got wrong file from archive!)";
 
     return 1;
 }
-- 
2.30.2