X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=infra%2Fdgit-repos-policy-debian;h=e85e92c5ebf4531ccc20229c2f4004ba6a49b598;hb=099608874f16c22a774ff9f427a8f172c84c66f9;hp=b6310d958d1ee61273f2348181ce7a7cc2056a98;hpb=0a1c524cdd52435f931efdb078554a3bc1bf0eae;p=dgit.git
diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index b6310d95..e85e92c5 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('%');
@@ -108,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 ($$) {
@@ -237,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;
}
@@ -294,10 +334,19 @@ sub action_push () {
if (deliberately('include-questionable-history')) {
return 0;
}
- 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\n";
+ die <;
- 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})