infrastructure: Properly honour NOCOMMITCHECK policy hook exit status.

Closes:#851800.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 0fd00bbb6d808297244b41c85b073d8403895c31..c73480b760c0e476f397bd54f3bef1e4b363710f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ dgit (3.6~) unstable; urgency=medium
   * Use `confess' to print a stack trace in a couple of internal error
     rcases.
 
+  Infrastructure:
+  * Properly honour NOCOMMITCHECK policy hook exit status.
+    Closes:#851800.
+
   Test suite:
   * downstream-gitless: Test import of .dsc from unknown distro.
   * downstream-gitless: Test import of .dsc with unsafe url.

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index eb4b377334d017807e7f22d70a22946be0707b9e..aa6fecd2eb72028c79387228cee3364a1c3f40c5 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -163,6 +163,7 @@ setup_sigwarn();
 #    NOCOMMITCHECK   (8)
 #         suppress dgit-repos-server's check that commits do
 #         not lack "committer" info (eg as produced by #849041)
+#         ("push" only)
 # any unexpected bits mean failure, and then known set bits are ignored
 # if no unexpected bits set, operation continues (subject to meaning
 # of any expected bits set).  So, eg, exit 0 means "continue normally"
@@ -873,7 +874,7 @@ sub checks () {
 
     @policy_args = ($package,$version,$suite,$tagname,
                    join(",",@deliberatelies));
-    $policy = policyhook(NOFFCHECK|FRESHREPO, 'push', @policy_args);
+    $policy = policyhook(NOFFCHECK|FRESHREPO|NOCOMMITCHECK, 'push', @policy_args);
 
     if (defined $tagexists_error) {
        if ($policy & FRESHREPO) {