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 6e76636c1d30a4f3f4104a8e259e1041d9a52be6..522105103ffe3a1136a31cd14c7a5600b8c13cdc 100755 (executable)
--- 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)'
 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")
        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'
 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")
        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
 
 def parse_args():
        global opmode

-       global service

        global prefix
        global key_prefix
        global debug_level
        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)()
        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]
        prefix = '' if av.prefix is None else av.prefix[0]
        key_prefix = av.conf_key_prefix
        output_version = av.output_version[0]