From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 22 Nov 2019 23:04:12 +0000 (+0000)
Subject: make-secnet-sites: Actually fix -P option (!)
X-Git-Tag: v0.5.1~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=351fc77c719a6fae532c76d2271b2f4ddafa6527;p=secnet.git

make-secnet-sites: Actually fix -P option (!)

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

diff --git a/make-secnet-sites b/make-secnet-sites
index 4826a44..c26cab0 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -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"