Minor fixes to get setup_chromeos and build_chromeos working with build_tc
PRESUBMIT=passed
R=asharif,bjanakiraman
DELTA=19 (5 added, 3 deleted, 11 changed)
OCL=45153-p2
RCL=45166-p2
RDATE=2010/11/11 11:32:00
P4 change: 42605749
diff --git a/v14/setup_chromeos.py b/v14/setup_chromeos.py
index cd2bf87..73d1a7c 100755
--- a/v14/setup_chromeos.py
+++ b/v14/setup_chromeos.py
@@ -74,13 +74,13 @@
version = tags[0]
print version
elif options.version == "top":
- version = ""
+ version = "top"
elif options.version is None:
Usage(parser)
else:
version = options.version.strip()
- if not version in tags:
+ if not version in tags and version != "top":
print "Version: '" + version + "' does not exist"
Usage(parser)
@@ -90,7 +90,7 @@
directory = options.directory.strip()
- if version == "":
+ if version == "top":
branch = "master"
else:
branch = ".".join(version.split(".")[0:-1]) + ".B"
@@ -106,8 +106,9 @@
"ssh://git@gitrw.chromium.org:9222/manifest-internal -b "
+ branch)
commands.append("repo sync -j10")
- commands.append("repo forall -c 'git checkout -f -b %s %s'"
- % (branch, version))
+ if branch != "master":
+ commands.append("repo forall -c 'git checkout -f -b %s %s'"
+ % (branch, version))
utils.RunCommands(commands)
commands = []