chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split brain: Rename quilt mode `apply' to `unapplied'
[dgit.git]
/
infra
/
dgit-repos-policy-debian
diff --git
a/infra/dgit-repos-policy-debian
b/infra/dgit-repos-policy-debian
index 7ad2c7d57b48145d095e68d8d80fa2e314f42bff..4dab576f1a4257e3bff41aef8ac4f4b1d30105f1 100755
(executable)
--- a/
infra/dgit-repos-policy-debian
+++ b/
infra/dgit-repos-policy-debian
@@
-352,11
+352,8
@@
END
my $mustreject=0;
while (my $taintid = shift @taintids) {
my $mustreject=0;
while (my $taintid = shift @taintids) {
- # git cat-file prints a spurious newline after it gets EOF
- # This is not documented. I guess it might go away. So we
- # just read what we expect and then let it get SIGPIPE.
$!=0; $_ = <CHKOUT>;
$!=0; $_ = <CHKOUT>;
- die "
$?
$!" unless defined $_;
+ die "
($taintid @objscatcmd)
$!" unless defined $_;
printdebug "|< ", $_ if $debuglevel>=2;
next if m/^\w+ missing$/;
printdebug "|< ", $_ if $debuglevel>=2;
next if m/^\w+ missing$/;
@@
-364,7
+361,12
@@
END
my ($objid,$objtype,$nbytes) = ($1,$2,$3);
my $drop;
my ($objid,$objtype,$nbytes) = ($1,$2,$3);
my $drop;
- (read CHKOUT, $drop, $nbytes) == $nbytes or die;
+ (read CHKOUT, $drop, $nbytes) == $nbytes
+ or die "($taintid @objscatcmd) $!";
+
+ $!=0; $_ = <CHKOUT>;
+ die "($taintid @objscatcmd) $!" unless defined $_;
+ die "($taintid @objscatcmd) $_ ?" if m/\S/;
$taintinfoq ||= $poldbh->prepare(<<END);
SELECT package, time, comment FROM taints WHERE taint_id = ?
$taintinfoq ||= $poldbh->prepare(<<END);
SELECT package, time, comment FROM taints WHERE taint_id = ?
@@
-372,7
+374,7
@@
END
$taintinfoq->execute($taintid);
my $ti = $taintinfoq->fetchrow_hashref();
$taintinfoq->execute($taintid);
my $ti = $taintinfoq->fetchrow_hashref();
- die unless $ti;
+ die
"($taintid)"
unless $ti;
my $timeshow = defined $ti->{time}
? " at time ".strftime("%Y-%m-%d %H:%M:%S Z", gmtime $ti->{time})
my $timeshow = defined $ti->{time}
? " at time ".strftime("%Y-%m-%d %H:%M:%S Z", gmtime $ti->{time})