Merge "Do not access sections from config file if those do not exist …

…Closes-Bug: 1483357" into R2.20
Juniper · Aug 17, 2015 · 4ab5fd4 · 4ab5fd4
2 parents 8536be3 + 556e12b
commit 4ab5fd4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/opserver/opserver.py b/src/opserver/opserver.py
@@ -776,8 +776,8 @@ def _parse_args(self, args_str=' '.join(sys.argv[1:])):
         if args.conf_file:
             config = ConfigParser.SafeConfigParser()
             config.read([args.conf_file])
-            defaults.update(dict(config.items("DEFAULTS")))
-
+            if 'DEFAULTS' in config.sections():
+                defaults.update(dict(config.items("DEFAULTS")))
             if 'REDIS' in config.sections():
                 redis_opts.update(dict(config.items('REDIS')))
             if 'DISCOVERY' in config.sections():