updated changelog

[invirt/packages/invirt-base.git] / files / usr / sbin / invirt-getconf

diff --git a/files/usr/sbin/invirt-getconf b/files/usr/sbin/invirt-getconf
index bac6596..bb4fd80 100755 (executable)
--- a/files/usr/sbin/invirt-getconf
+++ b/files/usr/sbin/invirt-getconf
@@ -16,8 +16,8 @@ Examples:
   invirt-getconf authn.0.type
 """
 
-from invirt.config import load
-from sys import argv, exit, stderr
+from invirt.config import default_src_path, default_cache_path, load
+from sys import argv, exit, stderr, stdout
 from optparse import OptionParser
 
 class invirt_exception(Exception): pass
@@ -27,10 +27,10 @@ def main(argv):
         parser = OptionParser(usage = '%prog [options] key',
                 description = __doc__.strip().split('\n\n')[0])
         parser.add_option('-s', '--src',
-                default = '/etc/invirt/master.yaml',
+                default = default_src_path,
                 help = 'the source YAML configuration file to read from')
         parser.add_option('-c', '--cache',
-                default = '/var/lib/invirt/invirt.json',
+                default = default_cache_path,
                 help = 'path to the JSON cache')
         parser.add_option('-r', '--refresh',
                 action = 'store_true',
@@ -40,14 +40,17 @@ def main(argv):
                 help = 'list node\'s children')
         opts, args = parser.parse_args()
 
-        try: [key] = args
-        except: raise invirt_exception(__doc__.strip())
+        if len(args) > 1:
+            raise invirt_exception(__doc__.strip())
+        elif args and args[0]:
+            components = args[0].split('.')
+        else:
+            components = []
 
         conf = load(opts.src, opts.cache, opts.refresh)
-        components = key.split('.')
         for i, component in enumerate(components):
             progress = '.'.join(components[:i])
-            if type(conf) not in [dict, list]:
+            if type(conf) not in (dict, list):
                 raise invirt_exception(
                         '%s: node has no children (atomic datum)' % progress)
             if type(conf) == list:
@@ -60,10 +63,12 @@ def main(argv):
                     '%s: key "%s" not found' % (progress, component))
             except IndexError: raise invirt_exception(
                     '%s: index %s out of range' % (progress, component))
+
         if opts.ls:
-            if type(conf) not in [dict, list]:
+            if type(conf) not in (dict, list):
                 raise invirt_exception(
-                        '%s: node has no children (atomic datum)' % progress)
+                        '%s: node has no children (atomic datum)'
+                        % '.'.join(components))
             if type(conf) == list:
                 for i in xrange(len(conf)):
                     print i
@@ -71,7 +76,14 @@ def main(argv):
                 for k in conf.iterkeys():
                     print k
         else:
-            print conf
+            if type(conf) not in (dict, list):
+                print conf
+            else:
+                import yaml
+                try:    dumper = yaml.CSafeDumper
+                except: dumper = yaml.SafeDumper
+                yaml.dump(conf, stdout,
+                          Dumper = dumper, default_flow_style = False)
     except invirt_exception, ex:
         print >> stderr, ex
         return 1