From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Dec 2019 16:38:02 +0000 (+0000)
Subject: make-secnet-sites: Abolish now-obsolete `service' variable
X-Git-Tag: v0.6.0~63
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=01e69dc177f054f6b24ccabe91f7853a98aa942c

make-secnet-sites: Abolish now-obsolete `service' variable

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

diff --git a/make-secnet-sites b/make-secnet-sites
index 6e76636..5221051 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -314,7 +314,6 @@ class OpBase():
 class OpConf(OpBase):
 	opts = ['--conf']
 	help = 'sites.conf generation mode (default)'
-	def is_service(self): return 0
 	def positional_args(self, av):
 		if len(av.arg)>3:
 			print("Too many arguments")
@@ -334,7 +333,6 @@ class OpConf(OpBase):
 class OpUserv(OpBase):
 	opts = ['--userv','-u']
 	help = 'userv service fragment update mode'
-	def is_service(self): return 1
 	def positional_args(self, av):
 		if len(av.arg)!=4:
 			print("Wrong number of arguments")
@@ -390,7 +388,6 @@ class OpUserv(OpBase):
 
 def parse_args():
 	global opmode
-	global service
 	global prefix
 	global key_prefix
 	global debug_level
@@ -431,7 +428,6 @@ def parse_args():
 	debug_level = av.debug
 	debugrepr('av',av)
 	opmode = getattr(av,'opmode',OpConf)()
-	service = opmode.is_service()
 	prefix = '' if av.prefix is None else av.prefix[0]
 	key_prefix = av.conf_key_prefix
 	output_version = av.output_version[0]