chiark / gitweb /
dgit: Once again cope with archive skew
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 6 Sep 2019 20:03:57 +0000 (21:03 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 6 Sep 2019 21:12:06 +0000 (22:12 +0100)
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>
dgit

diff --git a/dgit b/dgit
index cdccc6057d10f30e65b66492e2962e17455d0af7..4804c9bd055f39880a28676ce5ec8bac62099cd2 100755 (executable)
--- 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;