diff options
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/rpki/config.py | 8 | ||||
| -rw-r--r-- | rpkid/testbed.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/rpkid/rpki/config.py b/rpkid/rpki/config.py index 67364d21..07f6bfe3 100644 --- a/rpkid/rpki/config.py +++ b/rpkid/rpki/config.py @@ -46,14 +46,18 @@ class parser(object): get-methods with default values and default section name. """ - def __init__(self, filename, section = None): + def __init__(self, filename, section = None, allow_missing = False): """ Initialize this parser. """ self.filename = filename self.cfg = ConfigParser.RawConfigParser() - self.cfg.readfp(open(filename), filename) + try: + self.cfg.readfp(open(filename), filename) + except IOError: + if not allow_missing: + raise self.default_section = section def has_section(self, section): diff --git a/rpkid/testbed.py b/rpkid/testbed.py index 451ec88a..1659bc61 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -75,7 +75,7 @@ if argv: print __doc__ raise RuntimeError, "Unexpected arguments %s" % argv -cfg = rpki.config.parser(cfg_file, "testbed") +cfg = rpki.config.parser(cfg_file, "testbed", allow_missing = True) # Load the YAML script early, so we can report errors ASAP |