diff options
| author | Daniil Baturin <daniil@vyos.io> | 2020-09-23 20:50:35 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-23 20:50:35 +0700 |
| commit | ca3e8dd78a6feb6bc103628384643201d9830e22 (patch) | |
| tree | e15643f78f88671620f3a899fee068c68ee96510 | |
| parent | 94355927bfa21cda01e7db54060cf0292bbacd43 (diff) | |
| parent | 893dad656fdd822bf770c269294dc51dfe5e6d33 (diff) | |
| download | vyos-1x-ca3e8dd78a6feb6bc103628384643201d9830e22.tar.gz vyos-1x-ca3e8dd78a6feb6bc103628384643201d9830e22.zip | |
Merge pull request #550 from sever-sever/T2856_crux
op-mode: T2856: Fix broken pipe in show version all
| -rw-r--r-- | op-mode-definitions/version.xml | 2 | ||||
| -rwxr-xr-x | src/op_mode/version.py | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/op-mode-definitions/version.xml b/op-mode-definitions/version.xml index 57931fdff..caf0dd6ea 100644 --- a/op-mode-definitions/version.xml +++ b/op-mode-definitions/version.xml @@ -18,7 +18,7 @@ <properties> <help>Show system version and versions of all packages</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/version.py --all</command> + <command>echo "Package versions:"; dpkg -l | awk '$0~/>/{exit}1'</command> </leafNode> </children> </node> diff --git a/src/op_mode/version.py b/src/op_mode/version.py index a9916d246..49f55e1b4 100755 --- a/src/op_mode/version.py +++ b/src/op_mode/version.py @@ -33,7 +33,6 @@ import vyos.limericks 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") @@ -118,9 +117,5 @@ if __name__ == '__main__': output = pystache.render(version_output_tmpl, version_data).strip() print(output) - if args.all: - print("Package versions:") - os.system("dpkg -l") - if args.funny: print(vyos.limericks.get_random()) |