From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 1 Dec 2019 17:35:27 +0000 (+0000)
Subject: make-secnet-sites: Tolerate late `complain'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=2633cf34b625dd3f2939ffe1686dc5ad23f8ee65;p=secnet.git

make-secnet-sites: Tolerate late `complain'

In e5baf0cd0e91353194df02c4c376b0c472f49ec2
  make-secnet-sites: Crash if complain() is called too late
we checked for this.

But actually we want to support it.  Do so by exiting right away.

So, early enough complaints are saved up.  Late ones cause immediate
exit.

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

diff --git a/make-secnet-sites b/make-secnet-sites
index ac3efe6..66b4cb1 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -543,6 +543,7 @@ def moan(msg):
 	"Complain about something in general"
 	global complaints
 	print(msg);
+	if complaints is None: sys.exit(1)
 	complaints=complaints+1
 
 class UntaintedRoot():