This will let us write to stdout. The only user right now is OpUserv
which always sets sitesfile so no functional change yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
else:
self.inputlines = pfilepath(self.inputfile)
def write_out(self):
else:
self.inputlines = pfilepath(self.inputfile)
def write_out(self):
- f=open(self.sitesfile+"-tmp",'w')
+ if self.sitesfile is None:
+ f=sys.stdout
+ else:
+ f=open(self.sitesfile+"-tmp",'w')
f.write("# sites file autogenerated by make-secnet-sites\n")
f.write("# generated %s, invoked by %s\n"%
(time.asctime(time.localtime(time.time())),
f.write("# sites file autogenerated by make-secnet-sites\n")
f.write("# generated %s, invoked by %s\n"%
(time.asctime(time.localtime(time.time())),
f.write("# valid /etc/secnet/sites.conf file\n\n")
self.write_out_contents(f)
f.write("# end of sites file\n")
f.write("# valid /etc/secnet/sites.conf file\n\n")
self.write_out_contents(f)
f.write("# end of sites file\n")
- f.close()
- os.rename(self.sitesfile+"-tmp",self.sitesfile)
+ if self.sitesfile is not None:
+ f.close()
+ os.rename(self.sitesfile+"-tmp",self.sitesfile)
class OpConf(OpBase):
opts = ['--conf']
class OpConf(OpBase):
opts = ['--conf']