From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Dec 2019 16:42:46 +0000 (+0000)
Subject: make-secnet-sites: OpBase.write_out: Tolerate sitesfile is None
X-Git-Tag: v0.6.0~62
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=e8344e4877576df778013d8837780001d0994ef8

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 <ijackson@chiark.greenend.org.uk>
---

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']