From 65c44e5ca1a01daf640d1a2883e4fd1b3d701a62 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Wed, 30 Jul 2008 21:27:08 -0400 Subject: [PATCH 1/1] invirt-config: print non-leaves as YAML svn path=/trunk/packages/sipb-xen-base/; revision=789 --- files/usr/sbin/invirt-getconf | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/files/usr/sbin/invirt-getconf b/files/usr/sbin/invirt-getconf index 4f10261..1976dbc 100755 --- a/files/usr/sbin/invirt-getconf +++ b/files/usr/sbin/invirt-getconf @@ -17,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 @@ -50,7 +50,7 @@ def main(argv): conf = load(opts.src, opts.cache, opts.refresh) 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: @@ -65,7 +65,7 @@ def main(argv): '%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) if type(conf) == list: @@ -75,7 +75,11 @@ 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 + yaml.safe_dump(conf, stdout, default_flow_style=False) except invirt_exception, ex: print >> stderr, ex return 1 -- 1.7.9.5