From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 1 Dec 2019 17:34:57 +0000 (+0000)
Subject: make-secnet-sites: Deduplicate `complain'
X-Git-Tag: v0.6.0~120
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=aedbecae9e5f0a7ea5e8309d56978daa56f1d9cc;p=secnet.git

make-secnet-sites: Deduplicate `complain'

The body contains much of moan.  Call it, instead.

No functional change.

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

diff --git a/make-secnet-sites b/make-secnet-sites
index b4cd9af..ac3efe6 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -538,9 +538,7 @@ levels={'vpn':vpnlevel, 'location':locationlevel, 'site':sitelevel}
 
 def complain(msg):
 	"Complain about a particular input line"
-	global complaints
-	print(("%s line %d: "%(file,line))+msg)
-	complaints=complaints+1
+	moan(("%s line %d: "%(file,line))+msg)
 def moan(msg):
 	"Complain about something in general"
 	global complaints