diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-09-10 10:42:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 10:42:06 +0200 |
| commit | 4f6e21a2775a6dec41d6b2d95b8dd16c051acebd (patch) | |
| tree | 44d7bc30e3a56e501609773193eb72552c368e5e | |
| parent | 32eb4b342e962f3f2c3f46671a9415f04b0db40b (diff) | |
| parent | c3d170b17e39e94e6f53e4afd8d0468d35e9d8fc (diff) | |
| download | vyos-1x-4f6e21a2775a6dec41d6b2d95b8dd16c051acebd.tar.gz vyos-1x-4f6e21a2775a6dec41d6b2d95b8dd16c051acebd.zip | |
Merge pull request #542 from sever-sever/T2856
op-mode: T2856: Fix broken pipe in show version all
| -rw-r--r-- | op-mode-definitions/show-version.xml | 2 | ||||
| -rwxr-xr-x | src/op_mode/show_version.py | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/op-mode-definitions/show-version.xml b/op-mode-definitions/show-version.xml index aae5bb008..905a4865c 100644 --- a/op-mode-definitions/show-version.xml +++ b/op-mode-definitions/show-version.xml @@ -18,7 +18,7 @@ <properties> <help>Show system version and versions of all packages</help> </properties> - <command>${vyos_op_scripts_dir}/show_version.py --all</command> + <command>echo "Package versions:"; dpkg -l | awk '$0~/>/{exit}1'</command> </leafNode> <leafNode name="quagga"> <properties> diff --git a/src/op_mode/show_version.py b/src/op_mode/show_version.py index d0d5c6785..5bbc2e1f1 100755 --- a/src/op_mode/show_version.py +++ b/src/op_mode/show_version.py @@ -27,7 +27,6 @@ from sys import exit from vyos.util import call parser = argparse.ArgumentParser() -parser.add_argument("-a", "--all", action="store_true", help="Include individual package versions") parser.add_argument("-f", "--funny", action="store_true", help="Add something funny to the output") parser.add_argument("-j", "--json", action="store_true", help="Produce JSON output") @@ -65,9 +64,5 @@ if __name__ == '__main__': tmpl = Template(version_output_tmpl) print(tmpl.render(version_data)) - if args.all: - print("Package versions:") - call("dpkg -l") - if args.funny: print(vyos.limericks.get_random()) |