Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Unified Diff: bin/cbuildbot.py

Issue 6291013: Have the ability for the PFQ to both rev Chrome and other packages. (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | bin/cbuildbot_config.py » ('j') | cros_mark_as_stable.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bin/cbuildbot.py
diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py
index b760e5cefcba1167a62650c8edb2e811976b5f9d..540b4387bb84906ec5ef85ab9582d02b3afac02d 100755
--- a/bin/cbuildbot.py
+++ b/bin/cbuildbot.py
@@ -735,17 +735,16 @@ def main():
if not os.path.isdir(boardpath):
_SetupBoard(buildroot, board=buildconfig['board'])
- # Perform uprev. If chrome_uprev is set, rev Chrome ebuilds.
- if options.chrome_rev:
- chrome_atom_to_build = _MarkChromeAsStable(buildroot, tracking_branch,
- options.chrome_rev, board)
- # If we found nothing to rev, we're done here.
- if not chrome_atom_to_build:
- return
-
- elif buildconfig['uprev']:
+ # Perform chrome uprev.
+ chrome_atom_to_build = _MarkChromeAsStable(buildroot, tracking_branch,
+ options.chrome_rev, board)
+ # Perform other uprevs.
+ if buildconfig['uprev']:
_UprevPackages(buildroot, tracking_branch, revisionfile,
buildconfig['board'], rev_overlays)
+ elif not chrome_atom_to_ebuild:
+ # We found nothing to rev, we're done here.
+ return
_EnableLocalAccount(buildroot)
« no previous file with comments | « no previous file | bin/cbuildbot_config.py » ('j') | cros_mark_as_stable.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698