From: Greg Price <price@mit.edu>
Date: Thu, 31 Jul 2008 01:21:40 +0000 (-0400)
Subject: show root in invirt-getconf, for empty/omitted path
X-Git-Tag: sipb-xen-base/8.12~8
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-base.git/commitdiff_plain/4fbc42e66b20d479ea33c2cd5b930b28639e7700?ds=sidebyside

show root in invirt-getconf, for empty/omitted path

svn path=/trunk/packages/sipb-xen-base/; revision=788
---

diff --git a/files/usr/sbin/invirt-getconf b/files/usr/sbin/invirt-getconf
index bac6596..4f10261 100755
--- a/files/usr/sbin/invirt-getconf
+++ b/files/usr/sbin/invirt-getconf
@@ -40,11 +40,14 @@ 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]:
@@ -60,6 +63,7 @@ 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]:
                 raise invirt_exception(