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: OpConf: Move positional_args to OpBase
[secnet.git]
/
make-secnet-sites
diff --git
a/make-secnet-sites
b/make-secnet-sites
index e18c6ceec383b7916261695cd806ace474ce4b9a..751479dd23da243eba4390789eb4c732adeb452d 100755
(executable)
--- a/
make-secnet-sites
+++ b/
make-secnet-sites
@@
-293,6
+293,11
@@
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 positional_args(self, av):
+ if len(av.arg)>3:
+ print("Too many arguments")
+ sys.exit(1)
+ (self.inputfile, self.outputfile) = (av.arg + [None]*2)[0:2]
def read_in(self):
if self.inputfile is None:
self.inputlines = pfile("stdin",sys.stdin.readlines())
def read_in(self):
if self.inputfile is None:
self.inputlines = pfile("stdin",sys.stdin.readlines())
@@
-316,11
+321,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 positional_args(self, av):
- if len(av.arg)>3:
- print("Too many arguments")
- sys.exit(1)
- (self.inputfile, self.outputfile) = (av.arg + [None]*2)[0:2]
def check_group(self,group,w): pass
def write_out(self):
if self.outputfile is None:
def check_group(self,group,w): pass
def write_out(self):
if self.outputfile is None: