aboutsummaryrefslogtreecommitdiffstats
path: root/lib/toaster/toastermain
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-02-18 18:28:18 +0000
committerAlexandru DAMIAN <alexandru.damian@intel.com>2015-02-18 19:08:41 +0000
commit5cc87ee0ac3b2bd399e7f009dda9d6de87209a27 (patch)
treefb2d7b8d8a8e190201f4713f65f4283bb9ddd742 /lib/toaster/toastermain
parenteefdae12120f879b555ba0a353277a18675eecbc (diff)
downloadbitbake-contrib-5cc87ee0ac3b2bd399e7f009dda9d6de87209a27.tar.gz
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. Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Diffstat (limited to 'lib/toaster/toastermain')
-rw-r--r--lib/toaster/toastermain/settings.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/toaster/toastermain/settings.py b/lib/toaster/toastermain/settings.py
index b6a42c062..a7304fa16 100644
--- a/lib/toaster/toastermain/settings.py
+++ b/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'