X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=infra%2Fdgit-repos-server;h=e794de25d152d4f421dc9064f1b58ce3670b3f68;hb=f040d41cc7411e08709a5e0ba97aa985589b4790;hp=ae30eeff20d958693d911d6b5f6a931e5decd1b0;hpb=f6cd040652129d18f3d7fe53b6bb62e5d0c79ec1;p=dgit.git

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index ae30eeff..e794de25 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -9,7 +9,7 @@
 #   --suites=SUITES-FILE       default DISTRO-DIR/suites
 #   --policy-hook=POLICY-HOOK  default DISTRO-DIR/policy-hook
 #   --dgit-live=DGIT-LIVE-DIR  default DISTRO-DIR/dgit-live
-# (DISTRO-DIR is not used other than as default)
+# (DISTRO-DIR is not used other than as default and to pass to policy hook)
 # internal usage:
 #  .../dgit-repos-server --pre-receive-hook PACKAGE
 #
@@ -117,7 +117,7 @@ $SIG{__WARN__} = sub { die $_[0]; };
 #    cleanup to do
 #
 # Policy hook script is invoked like this:
-#   POLICY-HOOK-SCRIPT DISTRO DGIT-REPOS-DIR DGIT-LIVE-DIR ACTION...
+#   POLICY-HOOK-SCRIPT DISTRO DGIT-REPOS-DIR DGIT-LIVE-DIR DISTRO-DIR ACTION...
 # ie.
 #   POLICY-HOOK-SCRIPT ... check-list [...]
 #   POLICY-HOOK-SCRIPT ... check-package PACKAGE [...]
@@ -179,6 +179,7 @@ our $distro;
 our $suitesfile;
 our $policyhook;
 our $dgitlive;
+our $distrodir;
 our $destrepo;
 our $workrepo;
 our $keyrings;
@@ -233,12 +234,9 @@ sub lockrealtree () {
     locksometree(realdestrepo);
 }
 
-sub mkrepotmp () {
-    my $tmpdir = "$dgitrepos/_tmp";
-    return if mkdir $tmpdir;
-    return if $! == EEXIST;
-    die $!;
-}
+sub mkrepotmp () { ensuredir "$dgitrepos/_tmp" };
+
+sub removedtagsfile () { "$dgitrepos/_removed-tags/$package"; }
 
 sub recorderror ($) {
     my ($why) = @_;
@@ -270,11 +268,11 @@ sub policyhook {
     my ($policyallowbits, @polargs) = @_;
     # => ($exitstatuspolicybitmap);
     die if $policyallowbits & ~0x3e;
-    my @cmd = ($policyhook,$distro,$dgitrepos,$dgitlive,@polargs);
+    my @cmd = ($policyhook,$distro,$dgitrepos,$dgitlive,$distrodir,@polargs);
     debugcmd '+',@cmd;
     my $r = system @cmd;
     die "system: $!" if $r < 0;
-    die "hook (".(shellquote @cmd).") failed ($?)"
+    die "dgit-repos-server: policy hook failed (or rejected) ($?)\n"
 	if $r & ~($policyallowbits << 8);
     printdebug sprintf "hook => %#x\n", $r;
     return $r >> 8;
@@ -301,15 +299,21 @@ sub movetogarbage () {
     # purposes (and, I guess, recovery from mistakes).  This is either
     # $garbage or $garbage-old.
     if (stat_exists "$garbagerepo") {
+	printdebug "movetogarbage: rmtree $garbagerepo-tmp\n";
 	rmtree "$garbagerepo-tmp";
 	if (rename "$garbagerepo-old", "$garbagerepo-tmp") {
+	    printdebug "movetogarbage: $garbagerepo-old -> -tmp, rmtree\n";
 	    rmtree "$garbagerepo-tmp";
 	} else {
 	    die "$garbagerepo $!" unless $!==ENOENT;
+	    printdebug "movetogarbage: $garbagerepo-old -> -tmp\n";
 	}
+	printdebug "movetogarbage: $garbagerepo -> -old\n";
 	rename "$garbagerepo", "$garbagerepo-old" or die "$garbagerepo $!";
     }
-    rename realdestrepo, $garbagerepo
+    my $real = realdestrepo;
+    printdebug "movetogarbage: $real -> $garbagerepo\n";
+    rename $real, $garbagerepo
 	or $! == ENOENT
 	or die "$garbagerepo $!";
 }
@@ -492,7 +496,7 @@ sub parsetag () {
 	    while (length) {
 		if (s/^distro\=(\S+) //) {
 		    die "$1 != $distro" unless $1 eq $distro;
-		} elsif (s/^(--deliberately-$package_re) //) {
+		} elsif (s/^(--deliberately-$deliberately_re) //) {
 		    push @deliberatelies, $1;
 		} elsif (s/^supersede:(\S+)=(\w+) //) {
 		    die "supersede $1 twice" if defined $supersedes{$1};
@@ -673,7 +677,7 @@ sub checktagnoreplay () {
     my @problems;
 
     git_for_each_tag_referring($onlyreferring, sub {
-	my ($objid,$fullrefname,$tagname) = @_;
+	my ($objid,$refobjid,$fullrefname,$tagname) = @_;
 	printdebug "checktagnoreplay - overwriting $fullrefname=$objid\n";
 	my $supers = $supersedes{$fullrefname};
 	if (!defined $supers) {
@@ -815,7 +819,8 @@ our %indistrodir = (
     'dgit-live' => \$dgitlive,
     );
 
-our @hookenvs = qw(distro suitesfile policyhook dgitlive keyrings dgitrepos);
+our @hookenvs = qw(distro suitesfile policyhook
+                   dgitlive keyrings dgitrepos distrodir);
 
 # workrepo and destrepo handled ad-hoc
 
@@ -912,9 +917,9 @@ sub parseargsdispatch () {
 	exit 0;
     }
 
-    $distro = $ENV{'DGIT_DRS_DISTRO'}     = argval();
-    my $distrodir                         = argval();
-    $keyrings = $ENV{'DGIT_DRS_KEYRINGS'} = argval();
+    $distro    = argval();
+    $distrodir = argval();
+    $keyrings  = argval();
 
     foreach my $dk (keys %indistrodir) {
 	${ $indistrodir{$dk} } = "$distrodir/$dk";