diff options
| author | Rob Austein <sra@hactrn.net> | 2015-07-21 17:41:54 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-07-21 17:41:54 +0000 |
| commit | c82f46c999a2dbd147dc5f126c368b84ad663234 (patch) | |
| tree | 73efa0705d4abb76e5afe743d052fc90b2a042e6 /rpki/config.py | |
| parent | 9376f9afbade89253f354e9164a6f40328fa494a (diff) | |
Last batch of catch-up merges. Still need to test, but this is a
development branch, so committing the merge before testing shouldn't
break anything.
svn path=/branches/tk705/; revision=6084
Diffstat (limited to 'rpki/config.py')
| -rw-r--r-- | rpki/config.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/rpki/config.py b/rpki/config.py index b8d25896..077f9350 100644 --- a/rpki/config.py +++ b/rpki/config.py @@ -314,3 +314,8 @@ class parser(object): pass except: logger.warning("insecure-debug-only-rsa-key-db configured but initialization failed, check for corrupted database file") + + try: + rpki.up_down.content_type = self.get("up_down_content_type") + except ConfigParser.NoOptionError: + pass |