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