sub apiquery ($) {
my ($subpath) = @_;
local $/=undef;
- my $cmd = "$dgitlive/dgit -d$distro \$DGIT_TEST_OPTS";
+ my $dgit = "$dgitlive/dgit";
+ $dgit = "dgit" if !stat_exists $dgit;
+ my $cmd = "$dgit -d$distro \$DGIT_TEST_OPTS";
$cmd .= " -".("D" x $debuglevel) if $debuglevel;
$cmd .= " archive-api-query $subpath";
printdebug "apiquery $cmd\n";
foreach my $entry (@$in_suite) {
my $vsn = $entry->{version};
die "$pkg ?" unless defined $vsn;
- my $tagref = "refs/tags/".debiantag $vsn;
+ my $tagref = "refs/tags/".debiantag $vsn, $distro;
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;
" 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;
my $age = time - $mtime;
printdebug "check_package age=$age\n";
- return 0 if $age < $new_upload_propagation_slop;
-
- return 0 if new_has_vsn_in_our_history();
-
if (good_suite_has_vsn_in_our_history) {
chmod $publicmode, "." or die $!;
+ $pkg_secret = 0;
return 0;
}
+ return 0 if $age < $new_upload_propagation_slop;
+
+ return 0 if new_has_vsn_in_our_history();
+
printdebug "check_package secret, deleted, tainting\n";
git_for_each_ref('refs/tags', sub {
return FRESHREPO;
}
+sub action_check_package () {
+ getpackage();
+ return check_package();
+}
+
sub getpushinfo () {
die unless @ARGV >= 4;
$version = shift @ARGV;
getpackage();
getpushinfo();
+ check_package(); # might make package public, or might add taints
+
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
if (deliberately('include-questionable-history')) {
return 0;
}
- die "Package is in NEW and has not been accepted or rejected yet;".
+ die "\nPackage is in NEW and has not been accepted or rejected yet;".
" use a --deliberately option to specify whether you are".
" keeping or discarding the previously pushed history. ".
- " Please RTFM dgit(1).\n";
+ " Please RTFM dgit(1).\n\n";
}
sub action_push_confirm () {
$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 $sleepy=0;
my $rcode;
-for (;;) {
- poldb_setup(poldb_path($repos));
- $stderr = '';
+my $db_busy_exception= 'Debian::Dgit::Policy::Debian::DB_BUSY';
- $rcode = $fn->();
- die unless defined $rcode;
+my @orgargv = @ARGV;
- eval { $poldbh->commit; };
+for (;;) {
+ @ARGV = @orgargv;
+ eval {
+ poldb_setup(poldb_path($repos), sub {
+ $poldbh->{HandleError} = sub {
+ return 0 unless $poldbh->err == 5; # SQLITE_BUSY, not in .pm :-(
+ die bless { }, $db_busy_exception;
+ };
+
+ eval ($ENV{'DGIT_RPD_TEST_DBLOOP_HOOK'}//'');
+ die $@ if length $@;
+ # used by tests/tests/debpolicy-dbretry
+ });
+
+ $stderr = '';
+
+ $rcode = $fn->();
+ die unless defined $rcode;
+
+ $poldbh->commit;
+ };
last unless length $@;
+ die $@ unless ref $@ eq $db_busy_exception;
die if $sleepy >= 20;
- print STDERR "[policy database busy, retrying]\n";
- sleep ++$sleepy;
+ $sleepy++;
+ print STDERR "[policy database busy, retrying (${sleepy}s)]\n";
- $poldbh->rollback;
+ eval { $poldbh->rollback; };
}
print STDERR $stderr or die $!;