# dgit repos policy hook script for Debian
use strict;
-$SIG{__WARN__} = sub { die $_[0]; };
+
+use Debian::Dgit qw(:DEFAULT :policyflags);
+setup_sigwarn();
use POSIX;
use JSON;
use IPC::Open2;
use Data::Dumper;
-use Debian::Dgit qw(:DEFAULT :policyflags);
use Debian::Dgit::Policy::Debian;
initdebug('%');
# [1] looking for the relevant git tag for the version number and not
# caring what that tag refers to.
#
+# When we are doing a push to a fresh repo, any version will do: in
+# this case, this is the first dgit upload of an existing package,
+# and we trust that the uploader hasn't included in their git
+# history any previous non-dgit uploads.
+#
# A wrinkle: if we approved a push recently, we treat NEW as having
# a version which is in our history. This is because the package may
# still be being uploaded. (We record this using the timestamp of the
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";
return $r;
}
-sub specific_suite_has_vsn_in_our_history ($) {
- my ($suite) = @_;
+sub vsn_in_our_history ($) {
+ my ($vsn) = @_;
+
+ # Eventually, when we withdraw support for old-format (DEP-14
+ # namespace) tags, we will need to change this to only look
+ # for debiantag_new. See the commit
+ # "Tag change: Update dgit-repos-policy-debian"
+ # (reverting which is a good start for that change).
+
+ my @tagrefs = map { "refs/tags/".$_ } debiantags $vsn, $distro;
+ printdebug " checking history vsn=$vsn tagrefs=@tagrefs\n";
+ open F, "-|", qw(git-for-each-ref), @tagrefs;
+ $_ = <F>;
+ close F;
+ return 1 if defined && m/\S/;
+ die "$pkg tagrefs @tagrefs $? $!" if $?;
+ return 0;
+}
+
+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;
}
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 {
getpackage();
getpushinfo();
+ check_package(); # might make package public, or might add taints
+
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
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 () {
my $mustreject=0;
while (my $taintid = shift @taintids) {
- # git cat-file prints a spurious newline after it gets EOF
- # This is not documented. I guess it might go away. So we
- # just read what we expect and then let it get SIGPIPE.
$!=0; $_ = <CHKOUT>;
- die "$? $!" unless defined $_;
+ die "($taintid @objscatcmd) $!" unless defined $_;
printdebug "|< ", $_ if $debuglevel>=2;
next if m/^\w+ missing$/;
- die unless m/^(\w+) (\w+) (\d+)\s/;
+ die "($taintid @objscatcmd) $_ ?" unless m/^(\w+) (\w+) (\d+)\s/;
my ($objid,$objtype,$nbytes) = ($1,$2,$3);
my $drop;
- (read CHKOUT, $drop, $nbytes) == $nbytes or die;
+ (read CHKOUT, $drop, $nbytes) == $nbytes
+ or die "($taintid @objscatcmd) $!";
+
+ $!=0; $_ = <CHKOUT>;
+ die "($taintid @objscatcmd) $!" unless defined $_;
+ die "($taintid @objscatcmd) $_ ?" if m/\S/;
$taintinfoq ||= $poldbh->prepare(<<END);
SELECT package, time, comment FROM taints WHERE taint_id = ?
$taintinfoq->execute($taintid);
my $ti = $taintinfoq->fetchrow_hashref();
- die unless $ti;
+ die "($taintid)" unless $ti;
my $timeshow = defined $ti->{time}
? " at time ".strftime("%Y-%m-%d %H:%M:%S Z", gmtime $ti->{time})
}
if (length $freshrepo) {
- if (!good_suite_has_vsn_in_our_history()) {
+ if (!good_suite_has_suitable_vsn(sub { 1; })) {
stat $freshrepo or die "$freshrepo $!";
my $oldmode = ((stat _)[2]);
my $oldwrites = $oldmode & 0222;
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 $!;
~ianmdlvl / dgit.git / blobdiff