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..1976dbc 100755 (executable)
--- a/files/usr/sbin/invirt-getconf
+++ b/files/usr/sbin/invirt-getconf
@@ -17,7 +17,7 @@ Examples:
 """
 
 from invirt.config import load
 """
 
 from invirt.config import load

-from sys import argv, exit, stderr
+from sys import argv, exit, stderr, stdout

 from optparse import OptionParser
 
 class invirt_exception(Exception): pass
 from optparse import OptionParser
 
 class invirt_exception(Exception): pass

@@ -40,14 +40,17 @@ def main(argv):
                 help = 'list node\'s children')
         opts, args = parser.parse_args()
 
                 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)
 
         conf = load(opts.src, opts.cache, opts.refresh)

-        components = key.split('.')

         for i, component in enumerate(components):
             progress = '.'.join(components[:i])
         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:
                 raise invirt_exception(
                         '%s: node has no children (atomic datum)' % progress)
             if type(conf) == list:

@@ -60,8 +63,9 @@ def main(argv):
                     '%s: key "%s" not found' % (progress, component))
             except IndexError: raise invirt_exception(
                     '%s: index %s out of range' % (progress, component))
                     '%s: key "%s" not found' % (progress, component))
             except IndexError: raise invirt_exception(
                     '%s: index %s out of range' % (progress, component))

+

         if opts.ls:
         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)
             if type(conf) == list:
                 raise invirt_exception(
                         '%s: node has no children (atomic datum)' % progress)
             if type(conf) == list:

@@ -71,7 +75,11 @@ def main(argv):
                 for k in conf.iterkeys():
                     print k
         else:
                 for k in conf.iterkeys():
                     print k
         else:

-            print conf
+            if type(conf) not in (dict, list):
+                print conf
+            else:
+                import yaml
+                yaml.safe_dump(conf, stdout, default_flow_style=False)

     except invirt_exception, ex:
         print >> stderr, ex
         return 1
     except invirt_exception, ex:
         print >> stderr, ex
         return 1