From cc4ef90ba831e8506dafcd2abcd7f9c93201cf9e Mon Sep 17 00:00:00 2001 From: Yunlian Jiang Date: Thu, 4 Apr 2013 11:15:58 -0700 Subject: 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 Tested-by: Yunlian Jiang Commit-Queue: Yunlian Jiang --- remote_gcc_build.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'remote_gcc_build.py') 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) -- cgit v1.2.3