projects
/
invirt/packages/invirt-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated changelog
[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
1976dbc
..
bb4fd80
100755
(executable)
--- a/
files/usr/sbin/invirt-getconf
+++ b/
files/usr/sbin/invirt-getconf
@@
-16,7
+16,7
@@
Examples:
invirt-getconf authn.0.type
"""
invirt-getconf authn.0.type
"""
-from invirt.config import load
+from invirt.config import default_src_path, default_cache_path, load
from sys import argv, exit, stderr, stdout
from optparse import OptionParser
from sys import argv, exit, stderr, stdout
from optparse import OptionParser
@@
-27,10
+27,10
@@
def main(argv):
parser = OptionParser(usage = '%prog [options] key',
description = __doc__.strip().split('\n\n')[0])
parser.add_option('-s', '--src',
parser = OptionParser(usage = '%prog [options] key',
description = __doc__.strip().split('\n\n')[0])
parser.add_option('-s', '--src',
- default = '/etc/invirt/master.yaml',
+ default = default_src_path,
help = 'the source YAML configuration file to read from')
parser.add_option('-c', '--cache',
help = 'the source YAML configuration file to read from')
parser.add_option('-c', '--cache',
- default = '/var/lib/invirt/invirt.json',
+ default = default_cache_path,
help = 'path to the JSON cache')
parser.add_option('-r', '--refresh',
action = 'store_true',
help = 'path to the JSON cache')
parser.add_option('-r', '--refresh',
action = 'store_true',
@@
-67,7
+67,8
@@
def main(argv):
if opts.ls:
if type(conf) not in (dict, list):
raise invirt_exception(
if opts.ls:
if type(conf) not in (dict, list):
raise invirt_exception(
- '%s: node has no children (atomic datum)' % progress)
+ '%s: node has no children (atomic datum)'
+ % '.'.join(components))
if type(conf) == list:
for i in xrange(len(conf)):
print i
if type(conf) == list:
for i in xrange(len(conf)):
print i
@@
-79,7
+80,10
@@
def main(argv):
print conf
else:
import yaml
print conf
else:
import yaml
- yaml.safe_dump(conf, stdout, default_flow_style=False)
+ try: dumper = yaml.CSafeDumper
+ except: dumper = yaml.SafeDumper
+ yaml.dump(conf, stdout,
+ Dumper = dumper, default_flow_style = False)
except invirt_exception, ex:
print >> stderr, ex
return 1
except invirt_exception, ex:
print >> stderr, ex
return 1