else:
self.inputlines = pfilepath(self.inputfile)
def write_out(self):
- if self.sitesfile is None:
+ if self.outputfile is None:
f=sys.stdout
else:
- f=open(self.sitesfile+"-tmp",'w')
+ f=open(self.outputfile+"-tmp",'w')
f.write("# sites file autogenerated by make-secnet-sites\n")
self.write_out_heading(f)
f.write("# use make-secnet-sites to turn this file into a\n")
f.write("# valid /etc/secnet/sites.conf file\n\n")
self.write_out_contents(f)
f.write("# end of sites file\n")
- if self.sitesfile is not None:
+ if self.outputfile is not None:
f.close()
- os.rename(self.sitesfile+"-tmp",self.sitesfile)
+ os.rename(self.outputfile+"-tmp",self.outputfile)
class OpConf(OpBase):
opts = ['--conf']
print("Wrong number of arguments")
sys.exit(1)
(self.header, self.groupfiledir,
- self.sitesfile, self.group) = av.arg
+ self.outputfile, self.group) = av.arg
self.group = Tainted(self.group,0,'command line')
# untrusted argument from caller
if "USERV_USER" not in os.environ: