Define buildroot properly (reverted)

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 441 matching lines @@
 
   buildconfig = config[config_name]
 
   for key in default.iterkeys():
     if not buildconfig.has_key(key):
       buildconfig[key] = default[key]
 
   return buildconfig
 
 
-def ResolveOverlays(overlays):
+def ResolveOverlays(buildroot, overlays):
   """Return the list of overlays to use for a given buildbot.
 
   Args:
     overlays: A string describing which overlays you want.
               'private': Just the private overlay.
               'public': Just the public overlay.
               'both': Both the public and private overlays.
   """
   public_overlay = '%s/src/third_party/chromiumos-overlay' % buildroot
   private_overlay = '%s/src/private-overlays/chromeos-overlay' % buildroot
@@ skipping 41 matching lines @@
   tracking_branch = options.tracking_branch
 
   if len(args) >= 1:
     buildconfig = _GetConfig(args[-1])
   else:
     Warning('Missing configuration description')
     parser.print_usage()
     sys.exit(1)
 
   # Calculate list of overlay directories.
-  overlays = ResolveOverlays(buildconfig['overlays'])
+  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)
 
     chroot_path = os.path.join(buildroot, 'chroot')
     if not os.path.isdir(chroot_path):
@@ skipping 43 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()