From 5b77d1a98fc290c0298692c1805eb61e6e9f701c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Dec 2011 21:39:39 +0000 Subject: [PATCH] make-secnet-sites: Fix userv invocation after pfilepath The commit 9b8369e07aeba5ed2c69fb4a7f74d07c8cebe015 make-secnet-sites: refactor to break out new function "pfilepath" broke the userv service invocation, because it turned out that later code depended on the "headerinput" variable whose assignment had been removed and replaced by a call to pfilepath. Make pfilepath return the lines read from the file and assign the result to headerinput. Signed-off-by: Ian Jackson --- make-secnet-sites | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/make-secnet-sites b/make-secnet-sites index 547f572..5911a39 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -391,8 +391,10 @@ def pline(i,allow_include=False): def pfilepath(pathname,allow_include=False): f=open(pathname) - pfile(pathname,f.readlines(),allow_include=allow_include) + lines=f.readlines() + pfile(pathname,lines,allow_include=allow_include) f.close() + return lines def pfile(name,lines,allow_include=False): "Process a file" @@ -465,7 +467,7 @@ else: if not ok: print "caller not in group %s"%group sys.exit(1) - pfilepath(header,allow_include=True) + headerinput=pfilepath(header,allow_include=True) userinput=sys.stdin.readlines() pfile("user input",userinput) else: -- 2.30.2