aboutsummaryrefslogtreecommitdiff
path: root/remote_gcc_build.py
diff options
context:
space:
mode:
authorYunlian Jiang <yunlian@google.com>2013-04-04 11:15:58 -0700
committerChromeBot <chrome-bot@google.com>2013-04-10 14:24:04 -0700
commitcc4ef90ba831e8506dafcd2abcd7f9c93201cf9e (patch)
tree808ae1a671cb1bae1247e200065c7ad721dd59b5 /remote_gcc_build.py
parent36f91adc5055984332cf467c1526e4f80d828fa7 (diff)
downloadtoolchain-utils-cc4ef90ba831e8506dafcd2abcd7f9c93201cf9e.tar.gz
Remove the branch prefix to make it work
BUG=None TEST=run remote_gcc_build.py with master branch and a source gcc dir. it works. Change-Id: I8fb7a91b5725749cc13db860fbcaf0f0fde2ae79 Reviewed-on: https://gerrit-int.chromium.org/35073 Reviewed-by: Han Shen <shenhan@google.com> Tested-by: Yunlian Jiang <yunlian@google.com> Commit-Queue: Yunlian Jiang <yunlian@google.com>
Diffstat (limited to 'remote_gcc_build.py')
-rwxr-xr-xremote_gcc_build.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/remote_gcc_build.py b/remote_gcc_build.py
index f7cb6c28..1ef4035b 100755
--- a/remote_gcc_build.py
+++ b/remote_gcc_build.py
@@ -290,7 +290,7 @@ def GetGccBranch(branch):
if not out:
GccBranchForToolchain(branch)
if not out:
- out = "master"
+ out = "remotes/cros/master"
new_branch = out.splitlines()[0]
return new_branch
@@ -306,11 +306,10 @@ def UploadGccPatch(chromeos_root, gcc_dir, branch):
"source".format(gcc_dir))
os.chdir(gcc_path)
RemoveOldBranch()
-
if not branch:
branch = "master"
branch = GetGccBranch(branch)
- command = ("git checkout -b {0} -t remotes/cros/{1} && "
+ command = ("git checkout -b {0} -t {1} && "
"rm -rf *".format(BRANCH, branch))
ce.RunCommand(command, print_to_console=False)