diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-18 18:17:04 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-18 23:31:57 +0000 |
commit | b77bfa84e1dd2f7fe760985a76d7bafcfc463802 (patch) | |
tree | 393f6348f68abe80c961ec66c1beeda974215887 | |
parent | 8df7ac2d5674abb5cb0cddec8476fc045ad2f074 (diff) |
infrastructure: Properly honour NOCOMMITCHECK policy hook exit status.
Closes:#851800.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | debian/changelog | 4 | ||||
-rwxr-xr-x | infra/dgit-repos-server | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 0fd00bb..c73480b 100644 --- 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 eb4b377..aa6fecd 100755 --- 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) { |