X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-policy-debian;h=a0ac51916027d74e481cad34a47c80a04d2776ae;hp=339081e93987c569783665c10aef56c80dbcb663;hb=5a453a69bd237e3921a6db60f675bdaefb741014;hpb=68ace2786dc26749014ea70a6ebb2b896b1f25d1

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 339081e9..a0ac5191 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;
@@ -281,10 +281,10 @@ sub action_push () {
     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 () {
@@ -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;