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

Unified Diff: bin/cbuildbot.py

Issue 5069001: Move sanity checks for missing directories until after checkout happens. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git@master
Patch Set: Alternative approach. Created 10 years, 1 month 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 | no next file » | no next file with comments »
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 58d5c3e2c3bc26cd765c456eed57d815597fe610..e723cd64396b9d2156b12bf04375d01429e2cd89 100755
--- a/bin/cbuildbot.py
+++ b/bin/cbuildbot.py
@@ -484,10 +484,6 @@ def _ResolveOverlays(buildroot, overlays):
paths = [public_overlay, private_overlay]
else:
Die('Incorrect overlay configuration: %s' % overlays)
- for path in paths:
- assert ':' not in path, 'Overlay must not contain colons: %s' % path
- if not os.path.isdir(path):
- Die('Missing overlay: %s' % path)
return paths
@@ -536,6 +532,12 @@ def main():
else:
_IncrementalCheckout(buildroot)
+ # Check that all overlays can be found.
+ for path in overlays:
+ assert ':' not in path, 'Overlay must not contain colons: %s' % path
scottz 2010/11/16 03:45:42 Why are we putting asserts in here still? From you
+ if not os.path.isdir(path):
+ Die('Missing overlay: %s' % path)
+
chroot_path = os.path.join(buildroot, 'chroot')
if not os.path.isdir(chroot_path):
_MakeChroot(buildroot)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698