From 5f11eac1478fb4797766ca4f5225a7f60d9cb993 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 25 Feb 2020 15:09:01 -0500 Subject: [PATCH] launcher/version: include OS/CPU info in output We often ask users what OS/version they're running when debugging. Include that in the version output to simplify the process. Change-Id: Ie480b6d1c874e6f4c6f4996a03795077b844f858 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/256732 Reviewed-by: David Pursehouse Tested-by: Mike Frysinger --- repo | 4 ++++ subcmds/version.py | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/repo b/repo index 8b05def3..0e9dd033 100755 --- a/repo +++ b/repo @@ -993,6 +993,10 @@ def _Version(): print(' (from %s)' % (__file__,)) print('git %s' % (ParseGitVersion().full,)) print('Python %s' % sys.version) + uname = platform.uname() + print('OS %s %s (%s)' % (uname.system, uname.release, uname.version)) + print('CPU %s (%s)' % + (uname.machine, uname.processor if uname.processor else 'unknown')) sys.exit(0) diff --git a/subcmds/version.py b/subcmds/version.py index 92316549..91dbe68f 100644 --- a/subcmds/version.py +++ b/subcmds/version.py @@ -15,7 +15,10 @@ # limitations under the License. from __future__ import print_function + +import platform import sys + from command import Command, MirrorSafeCommand from git_command import git, RepoSourceVersion, user_agent from git_refs import HEAD @@ -52,3 +55,7 @@ class Version(Command, MirrorSafeCommand): print('git %s' % git.version_tuple().full) print('git User-Agent %s' % user_agent.git) print('Python %s' % sys.version) + uname = platform.uname() + print('OS %s %s (%s)' % (uname.system, uname.release, uname.version)) + print('CPU %s (%s)' % + (uname.machine, uname.processor if uname.processor else 'unknown'))