X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=infra%2Fdgit-repos-policy-debian;h=0774f17b9e373947e0dfbd9309ebc6c683acf47a;hb=b769d51ab9e8b6102ec82197c6cd4005b87a9ada;hp=339081e93987c569783665c10aef56c80dbcb663;hpb=68ace2786dc26749014ea70a6ebb2b896b1f25d1;p=dgit.git

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 339081e9..0774f17b 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -106,7 +106,7 @@ sub specific_suite_has_vsn_in_our_history ($) {
     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;
@@ -461,17 +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_DRS_RPD_TEST_DBLOOP_HOOK'}//'');
-	die $@ if length $@;
-	# used by tests/tests/debpolicy-dbretry
+	    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;