X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-policy-debian;h=f20572d66314c3f999ef39f5a680c8f577eabeb8;hp=e02c100ccc5d093c36d63245eeac7a25fe2f599e;hb=08c290bed320734bdcc8d9b5316ebceafe278a33;hpb=972202563e62f7be43431e31497f1d2a19ada0d8 diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian index e02c100c..f20572d6 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"; @@ -98,33 +100,41 @@ sub apiquery ($) { return $r; } -sub specific_suite_has_vsn_in_our_history ($) { - my ($suite) = @_; +sub vsn_in_our_history ($) { + my ($vsn) = @_; + + my $tagref = "refs/tags/".debiantag $vsn, $distro; + printdebug " checking history vsn=$vsn tagref=$tagref\n"; + $?=0; my $r = system qw(git show-ref --verify --quiet), $tagref; + return 1 if !$r; + return 0 if $r==256; + die "$pkg tagref $tagref $? $!"; +} + +sub specific_suite_has_suitable_vsn ($$) { + my ($suite, $vsn_check) = @_; # tests $vsn_check->($version) my $in_suite = apiquery "dsc_in_suite/$suite/$pkg"; foreach my $entry (@$in_suite) { my $vsn = $entry->{version}; die "$pkg ?" unless defined $vsn; - my $tagref = "refs/tags/".debiantag $vsn; - 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; - next if $r==256; - die "$pkg tagref $tagref $? $!"; + printdebug " checking history found suite=$suite vsn=$vsn\n"; + return 1 if $vsn_check->($vsn); } return 0; } sub new_has_vsn_in_our_history () { - return specific_suite_has_vsn_in_our_history('new'); + return specific_suite_has_suitable_vsn('new', \&vsn_in_our_history); } -sub good_suite_has_vsn_in_our_history () { +sub good_suite_has_suitable_vsn ($) { + my ($vsn_check) = @_; # as for specific_suite_has_specific_vsn my $suites = apiquery "suites"; foreach my $suitei (@$suites) { my $suite = $suitei->{name}; die unless defined $suite; next if $suite =~ m/\bnew$/; - return 1 if specific_suite_has_vsn_in_our_history($suite); + return 1 if specific_suite_has_suitable_vsn($suite, $vsn_check); } return 0; } @@ -206,8 +216,7 @@ sub add_taint_by_tag ($$) { " removed from NEW (ie, rejected) (or never arrived)"); } -sub action_check_package () { - getpackage(); +sub check_package () { return 0 unless $pkg_exists; return 0 unless $pkg_secret; @@ -220,15 +229,16 @@ sub action_check_package () { my $age = time - $mtime; printdebug "check_package age=$age\n"; - return 0 if $age < $new_upload_propagation_slop; - - return 0 if new_has_vsn_in_our_history(); - - if (good_suite_has_vsn_in_our_history) { + if (good_suite_has_suitable_vsn(\&vsn_in_our_history)) { chmod $publicmode, "." or die $!; + $pkg_secret = 0; return 0; } + return 0 if $age < $new_upload_propagation_slop; + + return 0 if new_has_vsn_in_our_history(); + printdebug "check_package secret, deleted, tainting\n"; git_for_each_ref('refs/tags', sub { @@ -239,6 +249,11 @@ sub action_check_package () { return FRESHREPO; } +sub action_check_package () { + getpackage(); + return check_package(); +} + sub getpushinfo () { die unless @ARGV >= 4; $version = shift @ARGV; @@ -256,6 +271,8 @@ sub action_push () { getpackage(); getpushinfo(); + check_package(); # might make package public, or might add taints + return 0 unless $pkg_exists; return 0 unless $pkg_secret; @@ -272,10 +289,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 () { @@ -337,7 +354,7 @@ END printdebug "|< ", $_ if $debuglevel>=2; next if m/^\w+ missing$/; - die unless m/^(\w+) (\w+) (\d+)\s/; + die "$_ ?" unless m/^(\w+) (\w+) (\d+)\s/; my ($objid,$objtype,$nbytes) = ($1,$2,$3); my $drop; @@ -403,7 +420,7 @@ END } if (length $freshrepo) { - if (!good_suite_has_vsn_in_our_history()) { + if (!good_suite_has_suitable_vsn(\&vsn_in_our_history)) { stat $freshrepo or die "$freshrepo $!"; my $oldmode = ((stat _)[2]); my $oldwrites = $oldmode & 0222; @@ -445,21 +462,39 @@ if (!$fn) { my $sleepy=0; my $rcode; -for (;;) { - poldb_setup(poldb_path($repos)); - $stderr = ''; +my $db_busy_exception= 'Debian::Dgit::Policy::Debian::DB_BUSY'; - $rcode = $fn->(); - die unless defined $rcode; +my @orgargv = @ARGV; - eval { $poldbh->commit; }; +for (;;) { + @ARGV = @orgargv; + eval { + 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_RPD_TEST_DBLOOP_HOOK'}//''); + die $@ if length $@; + # used by tests/tests/debpolicy-dbretry + }); + + $stderr = ''; + + $rcode = $fn->(); + die unless defined $rcode; + + $poldbh->commit; + }; last unless length $@; + die $@ unless ref $@ eq $db_busy_exception; die if $sleepy >= 20; - print STDERR "[policy database busy, retrying]\n"; - sleep ++$sleepy; + $sleepy++; + print STDERR "[policy database busy, retrying (${sleepy}s)]\n"; - $poldbh->rollback; + eval { $poldbh->rollback; }; } print STDERR $stderr or die $!;