From e8344e4877576df778013d8837780001d0994ef8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 4 Dec 2019 16:42:46 +0000 Subject: [PATCH] make-secnet-sites: OpBase.write_out: Tolerate sitesfile is None 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 --- make-secnet-sites | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/make-secnet-sites b/make-secnet-sites index 5221051..f9c249b 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -299,7 +299,10 @@ class OpBase(): 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())), @@ -308,8 +311,9 @@ class OpBase(): 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'] -- 2.30.2