[gentoo-commits] proj/layman:master commit in: layman/

["Brian Dolbec" <brian.dolbec@gmail.com>]

commit:     2c1ccc83fc0ff72ebe607a459c5d763be1b6421c
Author:     dol-sen <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Sun Aug  7 02:27:30 2011 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Aug  7 02:27:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=2c1ccc83

fix a bug causing it to not get the correct config path.
improve debug messages, set levels to 9

---
 layman/argsparser.py |   27 ++++++++++++++-------------
 layman/config.py     |   10 +++++-----
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/layman/argsparser.py b/layman/argsparser.py
index fd255d7..3bc54ba 100644
--- a/layman/argsparser.py
+++ b/layman/argsparser.py
@@ -269,12 +269,16 @@ class ArgsParser(BareConfig):
         # Set only alternate config settings from the options
         if self.options.__dict__['config'] is not None:
             self.defaults['config'] = self.options.__dict__['config']
-            self.output.debug('Got config file at ' + self.defaults['config'], 8)
+            self.output.debug('ARGSPARSER: Got config file at ' + self.defaults['config'], 8)
+        else: # fix the config path
+            self.defaults['config'] = self.defaults['config'].replace(
+                '%(configdir)s', self.defaults['configdir'])
         if self.options.__dict__['overlay_defs'] is not None:
             self.defaults['overlay_defs'] = self.options.__dict__['overlay_defs']
-            self.output.debug('Got overlay_defs location at ' + self.defaults['overlay_defs'], 8)
+            self.output.debug('ARGSPARSER: Got overlay_defs location at ' + self.defaults['overlay_defs'], 8)
 
         # Now parse the config file
+        self.output.debug('ARGSPARSER: Reading config file at ' + self.defaults['config'], 8)
         self.read_config(self.defaults)
 
         # handle quietness
@@ -283,9 +287,6 @@ class ArgsParser(BareConfig):
         elif self.options.__dict__['quietness']:
             self.set_option('quietness', self.options.__dict__['quietness'])
 
-        #self.output.debug('Reading config file at ' + self.defaults['config'], 8)
-
-        self.read_config(self.defaults)
 
     def __getitem__(self, key):
 
@@ -299,20 +300,20 @@ class ArgsParser(BareConfig):
             if len(overlays):
                 return  overlays
 
-        self.output.debug('Retrieving option', 8)
+        self.output.debug('ARGSPARSER: Retrieving options option: %s' % key, 9)
 
         if (key in self.options.__dict__.keys()
             and not self.options.__dict__[key] is None):
             return self.options.__dict__[key]
 
-        self.output.debug('Retrieving option', 8)
+        self.output.debug('ARGSPARSER: Retrieving config option: %s' % key, 9)
 
         if self.config.has_option('MAIN', key):
             if key in self._defaults['t/f_options']:
                 return self.t_f_check(self.config.get('MAIN', key))
             return self.config.get('MAIN', key)
 
-        self.output.debug('Retrieving option', 8)
+        self.output.debug('ARGSPARSER: Retrieving option: %s' % key, 9)
 
         if key in self._options.keys():
             return self._options[key]
@@ -320,7 +321,7 @@ class ArgsParser(BareConfig):
         if key in self.defaults.keys():
             return self.defaults[key]
 
-        self.output.debug('Retrieving option', 8)
+        self.output.debug('ARGSPARSER: Retrieving option failed. returning None', 9)
 
         return None
 
@@ -328,22 +329,22 @@ class ArgsParser(BareConfig):
     def keys(self):
         '''Special handler for the configuration keys.'''
 
-        self.output.debug('Retrieving keys', 8)
+        self.output.debug('ARGSPARSER: Retrieving keys', 9)
 
         keys = [i for i in self.options.__dict__.keys()
                 if not self.options.__dict__[i] is None]
 
-        self.output.debug('Retrieving keys', 8)
+        self.output.debug('ARGSPARSER: Retrieving keys 2', 9)
 
         keys += [name for name, _ in self.config.items('MAIN')
                  if not name in keys]
 
-        self.output.debug('Retrieving keys', 8)
+        self.output.debug('ARGSPARSER: Retrieving keys 3', 9)
 
         keys += [i for i in self.defaults.keys()
                  if not i in keys]
 
-        self.output.debug('Retrieving keys', 8)
+        self.output.debug('ARGSPARSER: Returning keys', 9)
 
         return keys
 

diff --git a/layman/config.py b/layman/config.py
index 644a63a..3873eef 100644
--- a/layman/config.py
+++ b/layman/config.py
@@ -150,14 +150,14 @@ class BareConfig(object):
         '''Special handler for the configuration keys.
         '''
         self._options['output'].debug(
-            'Retrieving %s options' % self.__class__.__name__, 8)
+            'Retrieving %s options' % self.__class__.__name__, 9)
         keys = [i for i in self._options]
         self._options['output'].debug(
-            'Retrieving %s defaults' % self.__class__.__name__, 8)
+            'Retrieving %s defaults' % self.__class__.__name__, 9)
         keys += [i for i in self._defaults
                  if not i in keys]
         self._options['output'].debug(
-            'Retrieving %s done...' % self.__class__.__name__, 8)
+            'Retrieving %s done...' % self.__class__.__name__, 9)
         return keys
 
 
@@ -195,7 +195,7 @@ class BareConfig(object):
 
     def _get_(self, key):
         self._options['output'].debug(
-            'Retrieving %s option: %s' % (self.__class__.__name__, key), 8)
+            'Retrieving %s option: %s' % (self.__class__.__name__, key), 9)
         if key == 'overlays':
             overlays = ''
             if (key in self._options
@@ -212,7 +212,7 @@ class BareConfig(object):
             if key in self._defaults['t/f_options']:
                 return self.t_f_check(self.config.get('MAIN', key))
             return self.config.get('MAIN', key)
-        self._options['output'].debug('Retrieving BareConfig default', 8)
+        self._options['output'].debug('Retrieving BareConfig default', 9)
         if key in self._defaults['t/f_options']:
             return self.t_f_check(self._defaults[key])
         if key in self._defaults: