Infra: ssh-wrap: Use master dgit-live for dispatch

[dgit.git] / infra / dgit-repos-policy-debian

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 5d843a06b611423e805b734567bce3f875c4126d..b21f797643a76ea27e19c93e6202c103ec644c21 100755 (executable)
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -86,7 +86,9 @@ our %deliberately;
 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";
@@ -459,13 +461,18 @@ my @orgargv = @ARGV;
 for (;;) {
     @ARGV = @orgargv;
     eval {
-       poldb_setup(poldb_path($repos));
-       $stderr = '';
+       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
+        });
 
-       $poldbh->{HandleError} = sub {
-           return 0 unless $poldbh->err == 5; # SQLITE_BUSY, not in .pm :-(
-           die bless { }, $db_busy_exception;
-       };
+       $stderr = '';
 
        $rcode = $fn->();
        die unless defined $rcode;