From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 6 Sep 2019 20:03:57 +0000 (+0100)
Subject: dgit: Once again cope with archive skew
X-Git-Tag: archive/debian/9.8~5
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=9b22c0de92ec58e5469d789c3d875098e2a82924;hp=e42f3ccb4157d214993f7b68125ee3d6d6a6dde5

dgit: Once again cope with archive skew

Since our http rearrangements, we have lost the ability to try
multiple dsc versions which means we cope badly with archive skew.

This was an editing error: in 7821907696db
   dgit: Abolish url_get in favour of url_fetch
we omitted to notice that url_get implicitly does what url_fetch needs
Ok404 to do.  So we didn't add the Ok404 parameter.

Fix this by adding it now.

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

diff --git a/dgit b/dgit
index cdccc605..4804c9bd 100755
--- a/dgit
+++ b/dgit
@@ -1755,7 +1755,7 @@ sub get_archive_dsc () {
     foreach my $vinfo (@vsns) {
 	my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
 	$dscurl = $vsn_dscurl;
-	$dscdata = url_fetch($dscurl);
+	$dscdata = url_fetch($dscurl, Ok404 => 1 );
 	if (!$dscdata) {
 	    $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
 	    next;