chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: Rationalise some messages
[dgit.git]
/
infra
/
dgit-repos-policy-debian
diff --git
a/infra/dgit-repos-policy-debian
b/infra/dgit-repos-policy-debian
index a770c55ec07d40e5858c2c782c41934a6ecab8f1..0774f17b9e373947e0dfbd9309ebc6c683acf47a 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;
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";
$cmd .= " -".("D" x $debuglevel) if $debuglevel;
$cmd .= " archive-api-query $subpath";
printdebug "apiquery $cmd\n";
@@
-104,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;
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;
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;
@@
-459,17
+461,18
@@
my @orgargv = @ARGV;
for (;;) {
@ARGV = @orgargv;
eval {
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;
$rcode = $fn->();
die unless defined $rcode;