Describe the repo launch version in `repo version`
repo version v1.7.8
(from https://android.googlesource.com/tools/repo.git)
repo launcher version 1.14
(from /home/sop/bin/repo)
git version 1.7.8.rc2.256.gcc761
Python 2.6.5 (r265:79063, Apr 16 2010, 13:57:41)
[GCC 4.4.3]
Change-Id: Ifcbe5b0e226a1a6ca85455eb62e4da5e9a0f0ca0
diff --git a/main.py b/main.py
index ebce9b7..a4cf430 100755
--- a/main.py
+++ b/main.py
@@ -36,6 +36,7 @@
from command import InteractiveCommand
from command import MirrorSafeCommand
from command import PagedCommand
+from subcmds.version import Version
from editor import Editor
from error import DownloadError
from error import ManifestInvalidRevisionError
@@ -334,6 +335,9 @@
_CheckWrapperVersion(opt.wrapper_version, opt.wrapper_path)
_CheckRepoDir(opt.repodir)
+ Version.wrapper_version = opt.wrapper_version
+ Version.wrapper_path = opt.wrapper_path
+
repo = _Repo(opt.repodir)
try:
try:
diff --git a/subcmds/version.py b/subcmds/version.py
index 83e77d0..03195f8 100644
--- a/subcmds/version.py
+++ b/subcmds/version.py
@@ -19,6 +19,9 @@
from project import HEAD
class Version(Command, MirrorSafeCommand):
+ wrapper_version = None
+ wrapper_path = None
+
common = False
helpSummary = "Display the version of repo"
helpUsage = """
@@ -31,5 +34,10 @@
print 'repo version %s' % rp.work_git.describe(HEAD)
print ' (from %s)' % rem.url
+
+ if Version.wrapper_path is not None:
+ print 'repo launcher version %s' % Version.wrapper_version
+ print ' (from %s)' % Version.wrapper_path
+
print git.version().strip()
print 'Python %s' % sys.version
