chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make-secnet-sites: OpBase.write_out: Move heading back into OpUserv
[secnet.git]
/
make-secnet-sites
diff --git
a/make-secnet-sites
b/make-secnet-sites
index f9c249bb7ac904dfc610e64bed99ef15fa9a5503..d9ed821dd0db152d00889d8af06e6ef072a980d4 100755
(executable)
--- 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")
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)
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)
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)
def write_out_contents(self,f):
for i in self.headerinput: f.write(i)
files=os.listdir(self.groupfiledir)