diff options
Diffstat (limited to 'bin/hostinfo')
| -rwxr-xr-x | bin/hostinfo | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/bin/hostinfo b/bin/hostinfo index 391e7db..5a2a516 100755 --- a/bin/hostinfo +++ b/bin/hostinfo @@ -19,9 +19,9 @@ def _get_data(path): stream = file(path, 'r') return yaml.load(stream) -def print_info(path, key=None, oneline=False): +def print_info(path, key=None, oneline=False, verbose=False): data = _get_data(path) - p = printer.Printer(data, oneline) + p = printer.Printer(data, oneline, verbose) p.info(key) def _print_keys(data, prefix = ''): @@ -71,12 +71,14 @@ def find_host(host): def main(): self_name = sys.argv.pop(0) - optlist, args = getopt.gnu_getopt(sys.argv, 'ofk', ['oneline', 'file', 'keys']) + optlist, args = getopt.gnu_getopt(sys.argv, 'ofkv', + ['oneline', 'file', 'keys', 'verbose']) flags = [opt for (opt, value) in optlist if value == ''] file = '--file' in flags or '-f' in flags oneline = '--oneline' in flags or '-o' in flags keys = '--keys' in flags or '-k' in flags + verbose = '--verbose' in flags or '-v' in flags if len(args) < 1: print('Usage: %s <host> [info]' % self_name) @@ -92,10 +94,11 @@ def main(): elif keys: print_keys(path) else: - if len(args) == 1: - print_info(path, oneline=oneline) - else: - print_info(path, key=args[1], oneline=oneline) + key=None + if len(args) > 1: + key = args[1] + + print_info(path, key=key, oneline=oneline, verbose=verbose) sys.exit(0) if __name__ == '__main__': |