mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-11 23:16:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move sanity checks for missing directories until after checkout happens.

Browse Source 
Preflight clean needs to wait until after the checkout happens before
it asserts that all of our overlays exist.

BUG=chromium-os:9197
TEST=Ran cbuildbot.py with missing chromiumos-overlay dir

Change-Id: If66574f01d1e85741e971919a9fa2da34f85872d

Review URL: http://codereview.chromium.org/5069001
This commit is contained in:
David James 2010-11-15 20:39:00 -08:00
parent d87170bb7b
commit 77f281a75e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/cbuildbot.py
View File

@ -484,10 +484,6 @@ def _ResolveOverlays(buildroot, overlays):
paths = [public_overlay, private_overlay] paths = [public_overlay, private_overlay]
else: else:
Die('Incorrect overlay configuration: %s' % overlays) 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 return paths
@ -536,6 +532,12 @@ def main():
else: else:
_IncrementalCheckout(buildroot) _IncrementalCheckout(buildroot)
# Check that all overlays can be found.
for path in overlays:
assert ':' not in path, 'Overlay must not contain colons: %s' % path
if not os.path.isdir(path):
Die('Missing overlay: %s' % path)
chroot_path = os.path.join(buildroot, 'chroot') chroot_path = os.path.join(buildroot, 'chroot')
if not os.path.isdir(chroot_path): if not os.path.isdir(chroot_path):
_MakeChroot(buildroot) _MakeChroot(buildroot)