Move sanity checks for missing directories until after checkout happens.

bin/cbuildbot.py

Index: bin/cbuildbot.py
diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py
index 58d5c3e2c3bc26cd765c456eed57d815597fe610..31ba321357c992d02077c6904a434cd9d8f06ead 100755
--- a/bin/cbuildbot.py
+++ b/bin/cbuildbot.py
@@ -230,13 +230,12 @@ def _GetVMConstants(buildroot):
   return (vdisk_size.strip(), statefulfs_size.strip())
 
 
-def _GitCleanup(buildroot, board, tracking_branch, overlays):
+def _GitCleanup(buildroot, board, tracking_branch):
   """Clean up git branch after previous uprev attempt."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
   if os.path.exists(cwd):
     RunCommand(['./cros_mark_as_stable', '--srcroot=..',
                 '--board=%s' % board,
-                '--overlays=%s' % ':'.join(overlays),
                 '--tracking_branch=%s' % tracking_branch, 'clean'],
                cwd=cwd, error_ok=True)
 
@@ -260,9 +259,9 @@ def _WipeOldOutput(buildroot):
 # =========================== Main Commands ===================================
 
 
-def _PreFlightRinse(buildroot, board, tracking_branch, overlays):
+def _PreFlightRinse(buildroot, board, tracking_branch):
   """Cleans up any leftover state from previous runs."""
-  _GitCleanup(buildroot, board, tracking_branch, overlays)
+  _GitCleanup(buildroot, board, tracking_branch)

[sosa, 2010/11/16 02:37:44]

Does this break git cleanup of some overlays?

[davidjames, 2010/11/16 02:55:41]

cros_mark_as_stable defaults to cleaning up all of the overlays it can find.
Still, I don't like this solution very much -- it'd be better to just move the
check.

I've moved the check instead now. PTAL.

   _CleanUpMountPoints(buildroot)
   RunCommand(['sudo', 'killall', 'kvm'], error_ok=True)
 
@@ -526,16 +525,16 @@ def main():
     parser.print_usage()
     sys.exit(1)
 
-  # Calculate list of overlay directories.
-  overlays = _ResolveOverlays(buildroot, buildconfig['overlays'])
-
   try:
-    _PreFlightRinse(buildroot, buildconfig['board'], tracking_branch, overlays)
+    _PreFlightRinse(buildroot, buildconfig['board'], tracking_branch)
     if options.clobber or not os.path.isdir(buildroot):
       _FullCheckout(buildroot, tracking_branch, url=options.url)
     else:
       _IncrementalCheckout(buildroot)
 
+    # Calculate list of overlay directories.
+    overlays = _ResolveOverlays(buildroot, buildconfig['overlays'])
+
     chroot_path = os.path.join(buildroot, 'chroot')
     if not os.path.isdir(chroot_path):
       _MakeChroot(buildroot)