From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Dec 2019 16:44:58 +0000 (+0000)
Subject: make-secnet-sites: OpBase.write_out: Move heading back into OpUserv
X-Git-Tag: v0.6.0~61
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=965556e1ce11f279ee4b74801063009c8deeefed

make-secnet-sites: OpBase.write_out: Move heading back into OpUserv

This relies on self.user, and in more general cases we want the output
to be reproducible so don't want the time either.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/make-secnet-sites b/make-secnet-sites
index f9c249b..d9ed821 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -304,9 +304,7 @@ class OpBase():
 		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())),
-			 self.user))
+		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)
@@ -381,6 +379,10 @@ class OpUserv(OpBase):
 		os.rename(self.groupfiledir+"/T"+self.group.groupname(),
 			  self.groupfiledir+"/R"+self.group.groupname())
 		OpBase.write_out(self)
+	def write_out_heading(self,f):
+		f.write("# generated %s, invoked by %s\n"%
+			(time.asctime(time.localtime(time.time())),
+			 self.user))
 	def write_out_contents(self,f):
 		for i in self.headerinput: f.write(i)
 		files=os.listdir(self.groupfiledir)