chiark / gitweb /
make-secnet-sites: Actually fix -P option (!)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 22 Nov 2019 23:04:12 +0000 (23:04 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 22 Nov 2019 23:04:12 +0000 (23:04 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
make-secnet-sites

index 4826a445caa5604ca2c61f75a3dc1c8730bc8cf1..c26cab0922e3f308f30c2dbff637150be59a3b33 100755 (executable)
@@ -214,6 +214,7 @@ def parse_args():
        global group
        global user
        global of
+       global prefix
        global key_prefix
 
        ap = argparse.ArgumentParser(description='process secnet sites files')
@@ -228,6 +229,7 @@ def parse_args():
        av = ap.parse_args()
        #print(repr(av), file=sys.stderr)
        service = 1 if av.userv else 0
+       prefix = '' if av.prefix is None else av.prefix[0]
        key_prefix = av.conf_key_prefix
        if service:
                if len(av.arg)!=4:
@@ -554,7 +556,6 @@ root=level([UntaintedRoot(x) for x in ['root','root']])
 # All vpns are children of this node
 obstack=[root]
 allow_defs=0   # Level above which new definitions are permitted
-prefix=''
 
 def set_property(obj,w):
        "Set a property on a configuration node"