- conf: initialize config with the default values. This fixes the manpage generation problem

osc/commandline.py

@@ -144,9 +144,6 @@ class Osc(cmdln.Cmdln):
     # overridden from Cmdln in order to use config values in options' help text
     def _help_preprocess_cmd_option_list(self, help, cmdname=None):
         help = cmdln.Cmdln._help_preprocess_cmd_option_list(self, help, cmdname)
-	# FIXME: setup.py build has no useful conf.config here.
-	if not conf.config.has_key('request_list_days'): 
-	    conf.config['request_list_days'] = 30
         return help % conf.config
 
     def do_init(self, subcmd, opts, project, package=None):

osc/conf.py

@@ -44,9 +44,6 @@ try:
 except:
     GNOME_KEYRING = False
 
-# being global to this module, this dict can be accessed from outside
-# it will hold the parsed configuration
-config = { }
 
 DEFAULTS = { 'apiurl': 'https://api.opensuse.org',
              'user': 'your_username',
@@ -92,6 +89,11 @@ DEFAULTS = { 'apiurl': 'https://api.opensuse.org',
              # check for unversioned/removed files before commit
              'check_filelist': '1',
 }
+
+# being global to this module, this dict can be accessed from outside
+# it will hold the parsed configuration
+config = DEFAULTS.copy()
+
 boolean_opts = ['debug', 'do_package_tracking', 'http_debug', 'post_mortem', 'traceback', 'check_filelist']
 
 new_conf_template = """