chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CREDITS, copyright: Promote Joey Hess's packaging credit
[secnet.git]
/
make-secnet-sites
diff --git
a/make-secnet-sites
b/make-secnet-sites
index 70fa7a4b9dd7483dc78b3612dd6e25b04fa65c60..85ee7a8eacda3e6701537034152e8daa22faad81 100755
(executable)
--- a/
make-secnet-sites
+++ b/
make-secnet-sites
@@
-293,6
+293,9
@@
class PkmElide(PkmBase):
class OpBase():
# Base case is reading a sites file from self.inputfilee.
# And writing a sites file to self.sitesfile.
class OpBase():
# Base case is reading a sites file from self.inputfilee.
# And writing a sites file to self.sitesfile.
+ def check_group(self,group,w):
+ if len(w) >= 3:
+ w[2].groupname()
def positional_args(self, av):
if len(av.arg)>3:
print("Too many arguments")
def positional_args(self, av):
if len(av.arg)>3:
print("Too many arguments")
@@
-321,7
+324,6
@@
class OpBase():
class OpConf(OpBase):
opts = ['--conf']
help = 'sites.conf generation mode (default)'
class OpConf(OpBase):
opts = ['--conf']
help = 'sites.conf generation mode (default)'
- def check_group(self,group,w): pass
def write_out(self):
if self.outputfile is None:
of=sys.stdout
def write_out(self):
if self.outputfile is None:
of=sys.stdout
@@
-369,11
+371,11
@@
class OpUserv(OpBase):
for i in ugs.split():
if self.group==i: ok=1
if not ok:
for i in ugs.split():
if self.group==i: ok=1
if not ok:
- print("caller not in group %s"%
group
)
+ print("caller not in group %s"%
self.group.groupname()
)
sys.exit(1)
def check_group(self,group,w):
if group!=self.group: complain("Incorrect group!")
sys.exit(1)
def check_group(self,group,w):
if group!=self.group: complain("Incorrect group!")
-
w[2].groupname(
)
+
OpBase.check_group(self,group,w
)
def read_in(self):
self.headerinput=pfilepath(self.header,allow_include=True)
self.userinput=sys.stdin.readlines()
def read_in(self):
self.headerinput=pfilepath(self.header,allow_include=True)
self.userinput=sys.stdin.readlines()