chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Infra: dgit-repos-server: Fix some typos in debug messages
[dgit.git]
/
infra
/
dgit-repos-policy-debian
diff --git
a/infra/dgit-repos-policy-debian
b/infra/dgit-repos-policy-debian
index cf0ac2e85f2e52ca283b16a73efd7dd2032975d2..e02c100ccc5d093c36d63245eeac7a25fe2f599e 100755
(executable)
--- a/
infra/dgit-repos-policy-debian
+++ b/
infra/dgit-repos-policy-debian
@@
-17,6
+17,8
@@
use Debian::Dgit::Policy::Debian;
initdebug('%');
enabledebuglevel $ENV{'DGIT_DRS_DEBUG'};
initdebug('%');
enabledebuglevel $ENV{'DGIT_DRS_DEBUG'};
+END { $? = 127; } # deliberate exit uses _exit
+
our $distro = shift @ARGV // die "need DISTRO";
our $repos = shift @ARGV // die "need DGIT-REPOS-DIR";
our $dgitlive = shift @ARGV // die "need DGIT-LIVE-DIR";
our $distro = shift @ARGV // die "need DISTRO";
our $repos = shift @ARGV // die "need DGIT-REPOS-DIR";
our $dgitlive = shift @ARGV // die "need DGIT-LIVE-DIR";
@@
-102,11
+104,12
@@
sub specific_suite_has_vsn_in_our_history ($) {
foreach my $entry (@$in_suite) {
my $vsn = $entry->{version};
die "$pkg ?" unless defined $vsn;
foreach my $entry (@$in_suite) {
my $vsn = $entry->{version};
die "$pkg ?" unless defined $vsn;
- my $tag = debiantag $vsn;
- $?=0; my $r = system qw(git show-ref --verify --quiet), $tag;
+ my $tagref = "refs/tags/".debiantag $vsn;
+ printdebug " checking history suite=$suite vsn=$vsn tagref=$tagref\n";
+ $?=0; my $r = system qw(git show-ref --verify --quiet), $tagref;
return 1 if !$r;
next if $r==256;
return 1 if !$r;
next if $r==256;
- die "$pkg tag
$tag
$? $!";
+ die "$pkg tag
ref $tagref
$? $!";
}
return 0;
}
}
return 0;
}
@@
-247,7
+250,7
@@
sub getpushinfo () {
}
}
}
}
-sub deliberately ($) { return $deliberately{
$_[0]
}; }
+sub deliberately ($) { return $deliberately{
"--deliberately-$_[0]"
}; }
sub action_push () {
getpackage();
sub action_push () {
getpackage();
@@
-261,9
+264,9
@@
sub action_push () {
if (deliberately('not-fast-forward')) {
add_taint(server_ref($suite),
if (deliberately('not-fast-forward')) {
add_taint(server_ref($suite),
- "
suite $suite when
--deliberately-not-fast-forward".
+ "
rewound suite $suite;
--deliberately-not-fast-forward".
" specified in signed tag $tagname for upload of".
" specified in signed tag $tagname for upload of".
- " version $version
into suite $suite
");
+ " version $version");
return NOFFCHECK|FRESHREPO;
}
if (deliberately('include-questionable-history')) {
return NOFFCHECK|FRESHREPO;
}
if (deliberately('include-questionable-history')) {
@@
-287,11
+290,17
@@
sub action_push_confirm () {
END
$initq->execute($pkg);
END
$initq->execute($pkg);
+ my @objscatcmd = qw(git);
+ push @objscatcmd, qw(--git-dir), $freshrepo if length $freshrepo;
+ push @objscatcmd, qw(cat-file --batch);
+ debugcmd '|',@objscatcmd if $debuglevel>=2;
+
my @taintids;
my $chkinput = tempfile();
while (my $taint = $initq->fetchrow_hashref()) {
push @taintids, $taint->{taint_id};
print $chkinput $taint->{gitobjid}, "\n" or die $!;
my @taintids;
my $chkinput = tempfile();
while (my $taint = $initq->fetchrow_hashref()) {
push @taintids, $taint->{taint_id};
print $chkinput $taint->{gitobjid}, "\n" or die $!;
+ printdebug '|> ', $taint->{gitobjid}, "\n" if $debuglevel>=2;
}
flush $chkinput or die $!;
seek $chkinput,0,0 or die $!;
}
flush $chkinput or die $!;
seek $chkinput,0,0 or die $!;
@@
-299,7
+308,7
@@
END
my $checkpid = open CHKOUT, "-|" // die $!;
if (!$checkpid) {
open STDIN, "<&", $chkinput or die $!;
my $checkpid = open CHKOUT, "-|" // die $!;
if (!$checkpid) {
open STDIN, "<&", $chkinput or die $!;
- exec
qw(git cat-file --batch)
or die $!;
+ exec
@objscatcmd
or die $!;
}
my ($taintinfoq,$overridesanyq,$untaintq,$overridesq);
}
my ($taintinfoq,$overridesanyq,$untaintq,$overridesq);
@@
-325,6
+334,7
@@
END
# just read what we expect and then let it get SIGPIPE.
$!=0; $_ = <CHKOUT>;
die "$? $!" unless defined $_;
# just read what we expect and then let it get SIGPIPE.
$!=0; $_ = <CHKOUT>;
die "$? $!" unless defined $_;
+ printdebug "|< ", $_ if $debuglevel>=2;
next if m/^\w+ missing$/;
die unless m/^(\w+) (\w+) (\d+)\s/;
next if m/^\w+ missing$/;
die unless m/^(\w+) (\w+) (\d+)\s/;
@@
-433,7
+443,7
@@
if (!$fn) {
}
my $sleepy=0;
}
my $sleepy=0;
-
our $rcode = 127
;
+
my $rcode
;
for (;;) {
poldb_setup(poldb_path($repos));
for (;;) {
poldb_setup(poldb_path($repos));
@@
-452,5
+462,6
@@
for (;;) {
$poldbh->rollback;
}
$poldbh->rollback;
}
-print STDERR $stderr;
-exit $rcode;
+print STDERR $stderr or die $!;
+flush STDERR or die $!;
+_exit $rcode;