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>
def pfilepath(pathname,allow_include=False):
f=open(pathname)
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)
def pfile(name,lines,allow_include=False):
"Process a file"
def pfile(name,lines,allow_include=False):
"Process a file"
if not ok:
print "caller not in group %s"%group
sys.exit(1)
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:
userinput=sys.stdin.readlines()
pfile("user input",userinput)
else: