Changeset 789 for trunk/packages/sipb-xen-base

Timestamp:

Jul 30, 2008, 9:27:08 PM (16 years ago)

Author:

price

Message:

invirt-config: print non-leaves as YAML

File:

• trunk/packages/sipb-xen-base/files/usr/sbin/invirt-getconf (modified) (4 diffs)

trunk/packages/sipb-xen-base/files/usr/sbin/invirt-getconf

@@ -18 +18 @@
 
 from invirt.config import load
-from sys import argv, exit, stderr
+from sys import argv, exit, stderr, stdout
 from optparse import OptionParser
 
@@ -51 +51 @@
         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)
@@ -66 +66 @@
 
         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)
@@ -76 +76 @@
                     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