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-debian: Break out check_package core
[dgit.git]
/
infra
/
dgit-repos-policy-debian
diff --git
a/infra/dgit-repos-policy-debian
b/infra/dgit-repos-policy-debian
index 399fd8cb39beb20fb442f4f0278a85c6f41f357c..9c2153df5e9e487ee2293ac3364066765ff4ba1f 100755
(executable)
--- a/
infra/dgit-repos-policy-debian
+++ b/
infra/dgit-repos-policy-debian
@@
-206,8
+206,7
@@
sub add_taint_by_tag ($$) {
" removed from NEW (ie, rejected) (or never arrived)");
}
" removed from NEW (ie, rejected) (or never arrived)");
}
-sub action_check_package () {
- getpackage();
+sub check_package () {
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
@@
-239,6
+238,11
@@
sub action_check_package () {
return FRESHREPO;
}
return FRESHREPO;
}
+sub action_check_package () {
+ getpackage();
+ return check_package();
+}
+
sub getpushinfo () {
die unless @ARGV >= 4;
$version = shift @ARGV;
sub getpushinfo () {
die unless @ARGV >= 4;
$version = shift @ARGV;
@@
-290,11
+294,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 $!;
@@
-302,7
+312,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);
@@
-328,6
+338,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/;