dgit-repos-server: Break out policy_checkpackage() (nfc)

[dgit.git] / infra / dgit-repos-server

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 0d55aa133b01679ffaeb5b6d88d01d2ae2189964..2be40c57c94cc50ebd8233fe0e0f23c8e4c4c9d1 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -120,8 +120,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,7 +140,14 @@ $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)
@@ -314,6 +323,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 +759,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 +850,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;