X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-server;h=560f1ad3664f0d2134adc003b7a81f00b0a57096;hp=9d6edb8f7191facb9d221a9968b1057794ec934c;hb=8c6209aa29c81ff6a02d9ab8de50b8392d0610b1;hpb=590b85823610a3e200dd4a16107b56d60bf175f4

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 9d6edb8f..560f1ad3 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -2,8 +2,13 @@
 # dgit-repos-server
 #
 # usages:
-#  .../dgit-repos-server DISTRO SUITES KEYRING-AUTH-SPEC \
-#      DGIT-REPOS-DIR POLICY-HOOK-SCRIPT --ssh
+#   dgit-repos-server DISTRO DISTRO-DIR AUTH-SPEC [<settings>] --ssh
+#   dgit-repos-server DISTRO DISTRO-DIR AUTH-SPEC [<settings>] --cron
+# settings
+#   --repos=GIT-REPOS-DIR      default DISTRO-DIR/repos/
+#   --suites=SUITES-FILE       default DISTRO-DIR/suites
+#   --policy-hook=POLICY-HOOK  default DISTRO-DIR/policy-hook
+# (DISTRO-DIR is not used other than as default)
 # internal usage:
 #  .../dgit-repos-server --pre-receive-hook PACKAGE
 #
@@ -14,7 +19,7 @@
 # SUITES is the name of a file which lists the permissible suites
 # one per line (#-comments and blank lines ignored)
 #
-# KEYRING-AUTH-SPEC is a :-separated list of
+# AUTH-SPEC is a :-separated list of
 #   KEYRING.GPG,AUTH-SPEC
 # where AUTH-SPEC is one of
 #   a
@@ -135,6 +140,11 @@ use strict;
 #
 # policy hook for a particular package will be invoked only once at
 # a time - (see comments about DGIT-REPOS-DIR, above)
+#
+# check-list and check-package are invoked via the --cron option.
+# First, without any locking, check-list is called.  It should produce
+# a list of package names.  Then check-package will be invoked for
+# each named package, in each case after taking an appropriate lock.
 
 
 use POSIX;
@@ -151,7 +161,6 @@ our $package;
 our $distro;
 our $suitesfile;
 our $policyhook;
-our $realdestrepo;
 our $destrepo;
 our $workrepo;
 our $keyrings;
@@ -167,6 +176,8 @@ sub debug {
     print DEBUG "$debug @_\n";
 }
 
+sub realdestrepo () { "$dgitrepos/$package.git"; }
+
 sub acquirelock ($$) {
     my ($lock, $must) = @_;
     my $fh;
@@ -205,7 +216,7 @@ sub locksometree ($) {
 }
 
 sub lockrealtree () {
-    locksometree($realdestrepo);
+    locksometree(realdestrepo);
 }
 
 sub mkrepotmp () {
@@ -277,7 +288,7 @@ sub mkrepo_fromtemplate ($) {
 }
 
 sub movetogarbage () {
-    # $realdestrepo must have been locked
+    # realdestrepo must have been locked
     my $garbagerepo = "$dgitrepos/${package}_garbage";
     # We arrange to always keep at least one old tree, for anti-rewind
     # purposes (and, I guess, recovery from mistakes).  This is either
@@ -291,7 +302,7 @@ sub movetogarbage () {
 	}
 	rename "$garbagerepo", "$garbagerepo-old" or die "$garbagerepo $!";
     }
-    rename $realdestrepo, $garbagerepo
+    rename realdestrepo, $garbagerepo
 	or $! == ENOENT
 	or die "$garbagerepo $!";
 }
@@ -337,7 +348,7 @@ sub dealwithfreshrepo () {
 }
 
 sub maybeinstallprospective () {
-    return if $destrepo eq $realdestrepo;
+    return if $destrepo eq realdestrepo;
 
     if (open REJ, "<", "$workrepo/drs-error") {
 	local $/ = undef;
@@ -381,8 +392,8 @@ sub maybeinstallprospective () {
 	movetogarbage;
     }
 
-    debug "install $destrepo => $realdestrepo";
-    rename $destrepo, $realdestrepo or die $!;
+    debug "install $destrepo => ".realdestrepo;
+    rename $destrepo, realdestrepo or die $!;
     remove "$destrepo.lock" or die $!;
 }
 
@@ -776,47 +787,19 @@ sub argval () {
     return $v;
 }
 
-sub parseargsdispatch () {
-    die unless @ARGV;
+our %indistrodir = (
+    # keys are used for DGIT_DRS_XXX too
+    'repos' => \$dgitrepos,
+    'suites' => \$suitesfile,
+    'policy-hook' => \$policyhook,
+    );
 
-    delete $ENV{'GIT_DIR'}; # if not run via ssh, our parent git process
-    delete $ENV{'GIT_PREFIX'}; # sets these and they mess things up
-
-    if ($ENV{'DGIT_DRS_DEBUG'}) {
-	$debug='=';
-	open DEBUG, ">&STDERR" or die $!;
-    }
-
-    if ($ARGV[0] eq '--pre-receive-hook') {
-	if ($debug) { $debug.="="; }
-	shift @ARGV;
-	@ARGV == 1 or die;
-	$package = shift @ARGV;
-	defined($distro = $ENV{'DGIT_DRS_DISTRO'}) or die;
-	defined($dgitrepos = $ENV{'DGIT_DRS_REPOS'}) or die;
-	defined($suitesfile = $ENV{'DGIT_DRS_SUITES'}) or die;
-	defined($workrepo = $ENV{'DGIT_DRS_WORK'}) or die;
-	defined($destrepo = $ENV{'DGIT_DRS_DEST'}) or die;
-	defined($keyrings = $ENV{'DGIT_DRS_KEYRINGS'}) or die $!;
-	defined($policyhook = $ENV{'DGIT_DRS_POLICYHOOK'}) or die $!;
-	open STDOUT, ">&STDERR" or die $!;
-	eval {
-	    stunthook();
-	};
-	if ($@) {
-	    recorderror "$@" or die;
-	    die $@;
-	}
-	exit 0;
-    }
+our @hookenvs = qw(distro suitesfile policyhook keyrings dgitrepos);
 
-    $ENV{'DGIT_DRS_DISTRO'} = $distro = argval();
-    $ENV{'DGIT_DRS_SUITES'} = argval();
-    $ENV{'DGIT_DRS_KEYRINGS'} = argval();
-    $ENV{'DGIT_DRS_REPOS'} = $dgitrepos = argval();
-    $ENV{'DGIT_DRS_POLICYHOOK'} = $policyhook = argval();
+# workrepo and destrepo handled ad-hoc
 
-    die unless @ARGV==1 && $ARGV[0] eq '--ssh';
+sub mode_ssh () {
+    die if @ARGV;
 
     my $cmd = $ENV{'SSH_ORIGINAL_COMMAND'};
     $cmd =~ m{
@@ -831,7 +814,6 @@ sub parseargsdispatch () {
     or reject "command string not understood";
     my $method = $1;
     $package = $2;
-    $realdestrepo = "$dgitrepos/$package.git";
 
     my $funcn = $method;
     $funcn =~ y/-/_/;
@@ -848,8 +830,8 @@ sub parseargsdispatch () {
 
     close $lfh;
 
-    if (stat_exists $realdestrepo) {
-	$destrepo = $realdestrepo;
+    if (stat_exists realdestrepo) {
+	$destrepo = realdestrepo;
     } else {
 	debug " fixmissing $funcn";
 	my $fixfunc = $main::{"fixmissing__$funcn"};
@@ -860,6 +842,60 @@ sub parseargsdispatch () {
     &$mainfunc;
 }
 
+sub parseargsdispatch () {
+    die unless @ARGV;
+
+    delete $ENV{'GIT_DIR'}; # if not run via ssh, our parent git process
+    delete $ENV{'GIT_PREFIX'}; # sets these and they mess things up
+
+    if ($ENV{'DGIT_DRS_DEBUG'}) {
+	$debug='=';
+	open DEBUG, ">&STDERR" or die $!;
+    }
+
+    if ($ARGV[0] eq '--pre-receive-hook') {
+	if ($debug) { $debug.="="; }
+	shift @ARGV;
+	@ARGV == 1 or die;
+	$package = shift @ARGV;
+	${ $main::{$_} } = $ENV{"DGIT_DRS_\U$_"} foreach @hookenvs;
+	defined($workrepo = $ENV{'DGIT_DRS_WORK'}) or die;
+	defined($destrepo = $ENV{'DGIT_DRS_DEST'}) or die;
+	open STDOUT, ">&STDERR" or die $!;
+	eval {
+	    stunthook();
+	};
+	if ($@) {
+	    recorderror "$@" or die;
+	    die $@;
+	}
+	exit 0;
+    }
+
+    $distro = $ENV{'DGIT_DRS_DISTRO'}     = argval();
+    my $distrodir                         = argval();
+    $keyrings = $ENV{'DGIT_DRS_KEYRINGS'} = argval();
+
+    foreach my $dk (keys %indistrodir) {
+	${ $indistrodir{$dk} } = "$distrodir/$dk";
+    }
+
+    while (@ARGV && $ARGV[0] =~ m/^--([-0-9a-z]+)=/ && $indistrodir{$1}) {
+	${ $indistrodir{$1} } = $'; #';
+	shift @ARGV;
+    }
+
+    $ENV{"DGIT_DRS_\U$_"} = ${ $main::{$_} } foreach @hookenvs;
+
+    die unless @ARGV==1;
+
+    my $mode = shift @ARGV;
+    die unless $mode =~ m/^--(\w+)$/;
+    my $fn = ${*::}{"mode_$1"};
+    die unless $fn;
+    $fn->();
+}
+
 sub unlockall () {
     while (my $fh = pop @lockfhs) { close $fh; }
 }