Test suite: debpolicy-dbretry: Move taintsout wait

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

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index a770c55ec07d40e5858c2c782c41934a6ecab8f1..4af7551c512014b0224f348ac44603415cc0b48c 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";
@@ -462,7 +464,7 @@ for (;;) {
        poldb_setup(poldb_path($repos));
        $stderr = '';
 
-       eval ($ENV{'DGIT_DRS_RPD_TEST_DBLOOP_HOOK'}//'');
+       eval ($ENV{'DGIT_RPD_TEST_DBLOOP_HOOK'}//'');
        die $@ if length $@;
        # used by tests/tests/debpolicy-dbretry