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=990abd2b9b82f90f958bf44f91cca99b8c288772;hp=a770c55ec07d40e5858c2c782c41934a6ecab8f1;hb=6dbc82e06ae1e6840dfa2ef2cc6b496561e6f333;hpb=520d2b03770aeb7be9b63fbdddb9ad896d535732 diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian index a770c55e..990abd2b 100755 --- a/infra/dgit-repos-policy-debian +++ b/infra/dgit-repos-policy-debian @@ -1,8 +1,26 @@ #!/usr/bin/perl -w # dgit repos policy hook script for Debian +# +# Copyright (C) 2015-2016 Ian Jackson +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . use strict; -$SIG{__WARN__} = sub { die $_[0]; }; + +use Debian::Dgit::Infra; # must precede Debian::Dgit; - can change @INC! +use Debian::Dgit qw(:DEFAULT :policyflags); +setup_sigwarn(); use POSIX; use JSON; @@ -11,7 +29,6 @@ use DBI; use IPC::Open2; use Data::Dumper; -use Debian::Dgit qw(:DEFAULT :policyflags); use Debian::Dgit::Policy::Debian; initdebug('%'); @@ -67,6 +84,11 @@ our %deliberately; # [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 @@ -86,7 +108,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 +122,49 @@ sub apiquery ($) { 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; + $_ = ; + 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; } @@ -219,9 +259,24 @@ sub check_package () { my $age = time - $mtime; printdebug "check_package age=$age\n"; - 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; + eval { + my $mirror_hook = "$distrodir/mirror-hook"; + if (stat_exists $mirror_hook) { + my @mirror_cmd = + ($mirror_hook, $distrodir, "updated-hook", $pkg); + debugcmd " (mirror)",@mirror_cmd; + system @mirror_cmd and failedcmd @mirror_cmd; + } + }; + if (length $@) { + chomp $@; + print STDERR "policy hook: warning:". + " failed to mirror publication of \`$pkg':". + " $@\n"; + } return 0; } @@ -279,10 +334,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 () { @@ -315,6 +370,10 @@ END my $checkpid = open CHKOUT, "-|" // die $!; if (!$checkpid) { open STDIN, "<&", $chkinput or die $!; + delete $ENV{GIT_ALTERNATE_OBJECT_DIRECTORIES}; + # ^ recent versions of git set this in the environment of + # receive hooks. This can cause us to see things which + # the user is trying to abolish. exec @objscatcmd or die $!; } @@ -336,19 +395,21 @@ END 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; $_ = ; - 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; $_ = ; + die "($taintid @objscatcmd) $!" unless defined $_; + die "($taintid @objscatcmd) $_ ?" if m/\S/; $taintinfoq ||= $poldbh->prepare(<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}) @@ -410,7 +471,7 @@ END } 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; @@ -459,17 +520,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;