summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2012-11-24 23:41:55 (GMT)
committerBritney Fransen <brfransen@gmail.com>2012-11-24 23:41:55 (GMT)
commit25d0595ebdeb9426957445336170919d22344e4d (patch)
treed7f26810f17fa1005f1fb5fb5d4814eb395a18e4
parentdab6c9cf2d6f1c75b665f6adfd05a7563b296efe (diff)
downloadlinhes_dev-25d0595ebdeb9426957445336170919d22344e4d.zip
mp.py: fix git branch parsing and add R7-testing.
-rwxr-xr-xbuild_tools/bin/mp.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/build_tools/bin/mp.py b/build_tools/bin/mp.py
index 8062f5c..4df837b 100755
--- a/build_tools/bin/mp.py
+++ b/build_tools/bin/mp.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python2
-# Version 0.7.4
+# Version 0.7.5
import os
import sys
@@ -41,9 +41,14 @@ XZPKG = ""
# See what git branch we're working under
git_repo = Git()
branches = git_repo.branch()
-git_branch = branches.split('*')[1].lstrip(' ')
-
-if git_branch == "testing":
+git_branch="didnt_find_it"
+for i in branches.split("\n"):
+ if i.strip().startswith("*"):
+ git_branch = i.split("*")[1].lstrip(' ')
+ break
+print git_branch
+
+if git_branch == "R7-testing":
SFIX = "-testing"
elif git_branch == "master":
SFIX = ""