X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=infra%2Fdgit-repos-policy-debian;h=990abd2b9b82f90f958bf44f91cca99b8c288772;hb=6dbc82e06ae1e6840dfa2ef2cc6b496561e6f333;hp=f20572d66314c3f999ef39f5a680c8f577eabeb8;hpb=08c290bed320734bdcc8d9b5316ebceafe278a33;p=dgit.git
diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index f20572d6..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
@@ -103,12 +125,20 @@ sub apiquery ($) {
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 $? $!";
+ # 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 ($$) {
@@ -232,6 +262,21 @@ sub check_package () {
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;
}
@@ -325,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 $!;
}
@@ -346,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})
@@ -420,7 +471,7 @@ END
}
if (length $freshrepo) {
- if (!good_suite_has_suitable_vsn(\&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;