X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=b035e108ebc9825ceebe58b0acab06228efebf28;hb=357fe8157dd06aad0e998a37f6cdb3c582ee5be0;hp=cdccc6057d10f30e65b66492e2962e17455d0af7;hpb=1ddac7dd4bfaaf5788648cb458f9afa37661fa98;p=dgit.git

diff --git a/dgit b/dgit
index cdccc605..b035e108 100755
--- a/dgit
+++ b/dgit
@@ -36,6 +36,7 @@ use File::Path;
 use File::Spec;
 use File::Temp qw(tempdir);
 use File::Basename;
+use File::Copy ();
 use Dpkg::Version;
 use Dpkg::Compression;
 use Dpkg::Compression::Process;
@@ -1755,7 +1756,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;
@@ -2659,6 +2660,8 @@ END
 		chomp $@;
 		progress "warning: $@";
 		$path = "$absurdity:$path";
+		open T, ">../../absurd-apply-warnings" or die $!;
+		close T or die $!;
 		progress f_ "%s: trying slow absurd-git-apply...", $us;
 		rename "../../gbp-pq-output","../../gbp-pq-output.0"
 		    or $!==ENOENT
@@ -2693,6 +2696,11 @@ gbp-pq import and dpkg-source disagree!
  dpkg-source --before-build gave tree %s
 END
 		$rawimport_hash = $gapplied;
+
+		if ($use_absurd) {
+		    File::Copy::copy("../../absurd-apply-warnings", \*STDERR)
+			  or die $!;
+		}
 	    };
 	    last unless $@;
 	}
@@ -4596,7 +4604,7 @@ END
 	        " of the archive's version.\n".
 		"To overwrite the archive's contents,".
 		" pass --overwrite[=VERSION].\n".
-		"To rewind history, if permitted by the archive,".
+		"To rewrite history, if permitted by the archive,".
 		" use --deliberately-not-fast-forward.";
 	}
     }