From c82f46c999a2dbd147dc5f126c368b84ad663234 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Tue, 21 Jul 2015 17:41:54 +0000
Subject: 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
---
 rpki/config.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'rpki/config.py')

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
-- 
cgit v1.2.3