X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=infra%2Fdgit-repos-policy-debian;h=4af7551c512014b0224f348ac44603415cc0b48c;hb=3462c484ba2b30a902f87578268b56df1633b5c5;hp=5d843a06b611423e805b734567bce3f875c4126d;hpb=a4cde71b1a09721ef2183495ba7e536ba88c2d8b;p=dgit.git

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 5d843a06..4af7551c 100755
--- 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";
@@ -462,6 +464,10 @@ for (;;) {
 	poldb_setup(poldb_path($repos));
 	$stderr = '';
 
+	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;