diff options
author | James Meyer <james.meyer@operamail.com> | 2013-01-10 22:12:48 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2013-01-10 22:13:00 (GMT) |
commit | 412779a29d766cb2832380e550db490356b67569 (patch) | |
tree | 82fc57e8944271b313b9e6eb582ce551feb2cf4c /build_tools/bin | |
parent | 8730ff5dfffcb615d4aeebbba08127f681fe2d93 (diff) | |
parent | 25d0595ebdeb9426957445336170919d22344e4d (diff) | |
download | linhes_dev-412779a29d766cb2832380e550db490356b67569.zip |
Merge remote-tracking branch 'origin/testing' into testing
Diffstat (limited to 'build_tools/bin')
-rwxr-xr-x | build_tools/bin/mp.py | 13 |
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 = "" |