use yaml.CSafeDumper and yaml.CSafeLoader everywhere

[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 d503dea..06c0aa7 100755 (executable)
--- a/files/usr/sbin/invirt-getconf
+++ b/files/usr/sbin/invirt-getconf
@@ -1,13 +1,14 @@
 #!/usr/bin/env python
 
 """
-invirt-getconf [-f FILE] KEY prints the configuration the option named KEY from
-the invirt configuration file FILE.  Keys are dot-separated paths into the YAML
+invirt-getconf loads an invirt configuration file (either the original YAML
+source or the faster-to-load JSON cache) and prints the configuration option
+with the given name (key).  Keys are dot-separated paths into the YAML
 configuration tree.  List indexes (0-based) are also treated as path
 components.
 
 (Due to this path language, certain restrictions are placed on the keys used in
-the YAML configuration, e.g. they cannot contain dots.)
+the YAML configuration; e.g., they cannot contain dots.)
 
 Examples:
 
@@ -16,7 +17,7 @@ Examples:
 """
 
 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
@@ -34,16 +35,22 @@ def main(argv):
         parser.add_option('-r', '--refresh',
                 action = 'store_true',
                 help = 'force the cache to be regenerated')
+        parser.add_option('-l', '--ls',
+                action = 'store_true',
+                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:
@@ -56,8 +63,25 @@ def main(argv):
                     '%s: key "%s" not found' % (progress, component))
             except IndexError: raise invirt_exception(
                     '%s: index %s out of range' % (progress, component))
-        print conf
-    except (invirt_exception, OSError), ex:
+
+        if opts.ls:
+            if type(conf) not in (dict, list):
+                raise invirt_exception(
+                        '%s: node has no children (atomic datum)' % progress)
+            if type(conf) == list:
+                for i in xrange(len(conf)):
+                    print i
+            else:
+                for k in conf.iterkeys():
+                    print k
+        else:
+            if type(conf) not in (dict, list):
+                print conf
+            else:
+                import yaml
+                yaml.dump(conf, stdout,
+                          Dumper=yaml.CSafeDumper, default_flow_style=False)
+    except invirt_exception, ex:
         print >> stderr, ex
         return 1