X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-server;h=f6ac5072d8849a1e3de83b60bffa67088b610ae6;hp=0d55aa133b01679ffaeb5b6d88d01d2ae2189964;hb=ab3be575e6a64ca698684995a02563b3cb82f68a;hpb=a7300206ae2e77d77f722e616123ddfc6dc02298

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 0d55aa13..f6ac5072 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -25,6 +25,7 @@
 # where AUTH-SPEC is one of
 #   a
 #   mDM.TXT
+# (With --cron AUTH-SPEC is not used and may be the empty string.)
 
 use strict;
 $SIG{__WARN__} = sub { die $_[0]; };
@@ -120,8 +121,10 @@ $SIG{__WARN__} = sub { die $_[0]; };
 # ie.
 #   POLICY-HOOK-SCRIPT ... check-list [...]
 #   POLICY-HOOK-SCRIPT ... check-package PACKAGE [...]
-#   POLICY-HOOK-SCRIPT ... push|push-confirm PACKAGE \
+#   POLICY-HOOK-SCRIPT ... push PACKAGE \
 #         VERSION SUITE TAGNAME DELIBERATELIES [...]
+#   POLICY-HOOK-SCRIPT ... push-confirm PACKAGE \
+#         VERSION SUITE TAGNAME DELIBERATELIES FRESH-REPO|'' [...]
 #
 # Exit status is a bitmask.  Bit weight constants are defined in Dgit.pm.
 #    NOFFCHECK   (2)
@@ -138,15 +141,23 @@ $SIG{__WARN__} = sub { die $_[0]; };
 # to-be-pushed objects have been received; TAGNAME is the
 # version-based tag
 #
+# FRESH-REPO is '' iff the repo for this package already existed, or
+# the pathname of the newly-created repo which will be renamed into
+# place if everything goes well.  (NB that this is generally not the
+# same repo as the cwd, because the objects are first received into a
+# temporary repo so they can be examined.)
+# 
 # if push requested FRESHREPO, push-confirm happens in said fresh repo
+# and FRESH-REPO is guaranteed not to be ''.
 #
 # 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.
+# a list of package names (one per line).  Then check-package will be
+# invoked for each named package, in each case after taking an
+# appropriate lock.
 #
 # If policy hook wants to run dgit (or something else in the dgit
 # package), it should use DGIT-LIVE-DIR/dgit (etc.)
@@ -155,6 +166,7 @@ $SIG{__WARN__} = sub { die $_[0]; };
 use POSIX;
 use Fcntl qw(:flock);
 use File::Path qw(rmtree);
+use File::Temp qw(tempfile);
 
 use Debian::Dgit qw(:DEFAULT :policyflags);
 
@@ -314,6 +326,17 @@ sub movetogarbage () {
 	or die "$garbagerepo $!";
 }
 
+sub policy_checkpackage () {
+    my $lfh = lockrealtree();
+
+    $policy = policyhook(FRESHREPO,'check-package',$package);
+    if ($policy & FRESHREPO) {
+	movetogarbage();
+    }
+
+    close $lfh;
+}
+
 #----- git-receive-pack -----
 
 sub fixmissing__git_receive_pack () {
@@ -739,7 +762,8 @@ sub checks () {
 	mkrepo_fromtemplate $destrepo;
     }
 
-    policyhook(0, 'push-confirm', @policy_args);
+    my $willinstall = ($destrepo eq realdestrepo ? '' : $destrepo);
+    policyhook(0, 'push-confirm', @policy_args, $willinstall);
 }
 
 sub onwardpush () {
@@ -829,14 +853,7 @@ sub mode_ssh () {
 
     reject "unknown method" unless $mainfunc;
 
-    my $lfh = lockrealtree();
-
-    $policy = policyhook(FRESHREPO,'check-package',$package);
-    if ($policy & FRESHREPO) {
-	movetogarbage;
-    }
-
-    close $lfh;
+    policy_checkpackage();
 
     if (stat_exists realdestrepo) {
 	$destrepo = realdestrepo;
@@ -850,6 +867,27 @@ sub mode_ssh () {
     &$mainfunc;
 }
 
+sub mode_cron () {
+    die if @ARGV;
+
+    my $listfh = tempfile();
+    open STDOUT, ">&", $listfh or die $!;
+    policyhook(0,'check-list');
+    open STDOUT, ">&STDERR" or die $!;
+
+    seek $listfh, 0, 0 or die $!;
+    while (<$listfh>) {
+	chomp or die;
+	next if m/^\s*\#/;
+	next unless m/\S/;
+	die unless m/^($package_re)$/;
+	
+	$package = $1;
+	policy_checkpackage();
+    }
+    die $! if $listfh->error;
+}    
+
 sub parseargsdispatch () {
     die unless @ARGV;