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) |