chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: Rename a variable $ups_tag to $ups_rev
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index cdccc6057d10f30e65b66492e2962e17455d0af7..b035e108ebc9825ceebe58b0acab06228efebf28 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-36,6
+36,7
@@
use File::Path;
use File::Spec;
use File::Temp qw(tempdir);
use File::Basename;
use File::Spec;
use File::Temp qw(tempdir);
use File::Basename;
+use File::Copy ();
use Dpkg::Version;
use Dpkg::Compression;
use Dpkg::Compression::Process;
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;
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;
if (!$dscdata) {
$skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
next;
@@
-2659,6
+2660,8
@@
END
chomp $@;
progress "warning: $@";
$path = "$absurdity:$path";
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
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;
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 $@;
}
};
last unless $@;
}
@@
-4596,7
+4604,7
@@
END
" of the archive's version.\n".
"To overwrite the archive's contents,".
" pass --overwrite[=VERSION].\n".
" of the archive's version.\n".
"To overwrite the archive's contents,".
" pass --overwrite[=VERSION].\n".
- "To rew
ind
history, if permitted by the archive,".
+ "To rew
rite
history, if permitted by the archive,".
" use --deliberately-not-fast-forward.";
}
}
" use --deliberately-not-fast-forward.";
}
}