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 "headerlines" 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 headerlines.

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

diff --git a/make-secnet-sites b/make-secnet-sites
index 547f5724652988189abd03ae46ff93fb2b28339b..5911a398eb9e581c3de2eaa06d5e4a45e74efd68 100755 (executable)
--- 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: