aboutsummaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastermain
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-02-18 18:28:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-20 12:58:19 +0000
commitc856a4efc95ab3031d9f3ee197ed54515df0fee6 (patch)
treef421813595e494edd40d81db6411dfeb8afaf5e6 /bitbake/lib/toaster/toastermain
parente133fbf301ee14c93db9b9bc930ab2463122544c (diff)
downloadopenembedded-core-contrib-c856a4efc95ab3031d9f3ee197ed54515df0fee6.tar.gz
bitbake: toaster: get proper version string
This patch brings in the toaster tree commit ID in the version string to allow users properly report their toaster version when submitting issues. (Bitbake rev: 5cc87ee0ac3b2bd399e7f009dda9d6de87209a27) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastermain')
-rw-r--r--bitbake/lib/toaster/toastermain/settings.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py
index b6a42c0626..a7304fa167 100644
--- a/bitbake/lib/toaster/toastermain/settings.py
+++ b/bitbake/lib/toaster/toastermain/settings.py
@@ -232,7 +232,8 @@ from os.path import dirname as DN
SITE_ROOT=DN(DN(os.path.abspath(__file__)))
import subprocess
-TOASTER_VERSION = subprocess.Popen('cd %s; git branch | grep "^* " | tr -d "* "' % SITE_ROOT, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]
+TOASTER_VERSION = subprocess.Popen('git branch | grep "^* " | tr -d "* "', cwd = SITE_ROOT, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]
+TOASTER_VERSION += " " + subprocess.Popen('git rev-parse HEAD ', cwd = SITE_ROOT, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]
ROOT_URLCONF = 'toastermain.urls'