* moved more generic code into `common` package

[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..ce0dfa6 100755 (executable)
--- a/files/usr/sbin/invirt-getconf
+++ b/files/usr/sbin/invirt-getconf
@@ -1,13 +1,14 @@
 #!/usr/bin/env python
 
 """
 #!/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
 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:
 
 
 Examples:
 

@@ -57,7 +58,7 @@ def main(argv):
             except IndexError: raise invirt_exception(
                     '%s: index %s out of range' % (progress, component))
         print conf
             except IndexError: raise invirt_exception(
                     '%s: index %s out of range' % (progress, component))
         print conf

-    except (invirt_exception, OSError), ex:
+    except invirt_exception, ex:

         print >> stderr, ex
         return 1
 
         print >> stderr, ex
         return 1