Move sanity checks for missing directories until after checkout happens.

bin/cbuildbot.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """CBuildbot is wrapper around the build process used by the pre-flight queue"""
 
 import errno
 import heapq
@@ skipping 466 matching lines @@
   public_overlay = '%s/src/third_party/chromiumos-overlay' % buildroot
   private_overlay = '%s/src/private-overlays/chromeos-overlay' % buildroot
   if overlays == 'private':
     paths = [private_overlay]
   elif overlays == 'public':
     paths = [public_overlay]
   elif overlays == 'both':
     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
 
 
 def main():
   # Parse options
   usage = "usage: %prog [options] cbuildbot_config"
   parser = optparse.OptionParser(usage=usage)
   parser.add_option('-r', '--buildroot',
                     help='root directory where build occurs', default=".")
   parser.add_option('-n', '--buildnumber',
@@ skipping 28 matching lines @@
   # Calculate list of overlay directories.
   overlays = _ResolveOverlays(buildroot, buildconfig['overlays'])
 
   try:
     _PreFlightRinse(buildroot, buildconfig['board'], tracking_branch, overlays)
     if options.clobber or not os.path.isdir(buildroot):
       _FullCheckout(buildroot, tracking_branch, url=options.url)
     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 your last comment it sounded like
this wasn't really necessary. 

+      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)
 
     boardpath = os.path.join(chroot_path, 'build', buildconfig['board'])
     if not os.path.isdir(boardpath):
       _SetupBoard(buildroot, board=buildconfig['board'])
 
     if buildconfig['uprev']:
       _UprevPackages(buildroot, tracking_branch, revisionfile,
@@ skipping 35 matching lines @@
   except:
     # Send failure to master bot.
     if not buildconfig['master'] and buildconfig['important']:
       cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_FAILED)
 
     raise
 
 
 if __name__ == '__main__':
     main()