[Checkins] SVN: zc.buildout/branches/gary-launchpad/ merge from python-support-8

[Gary Poster]

Log message for revision 110071:
  merge from python-support-8

Changed:
  _U  zc.buildout/branches/gary-launchpad/
  U   zc.buildout/branches/gary-launchpad/src/zc/buildout/buildout.py

-=-

Property changes on: zc.buildout/branches/gary-launchpad
___________________________________________________________________
Modified: svn:mergeinfo
   - /zc.buildout/branches/gary-6:109416,109421,109426
/zc.buildout/branches/gary-7:109424,109427
/zc.buildout/branches/gary-5:109383,109387,109425
/zc.buildout/trunk:108946,109993,109996
/zc.buildout/branches/gary-8:109905,110061

   + /zc.buildout/branches/gary-6:109416,109421,109426
/zc.buildout/branches/gary-7:109424,109427
/zc.buildout/branches/gary-5:109383,109387,109425
/zc.buildout/trunk:108946,109993,109996
/zc.buildout/branches/gary-8:109905,110061,110066

Modified: svk:merge
   - 62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-8:109905
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-8:110061
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/trunk:108946
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/trunk:109996

   + 62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-8:109905
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-8:110061
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-8:110066
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/trunk:108946
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/trunk:109996


Modified: zc.buildout/branches/gary-launchpad/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/branches/gary-launchpad/src/zc/buildout/buildout.py	2010-03-19 21:53:16 UTC (rev 110070)
+++ zc.buildout/branches/gary-launchpad/src/zc/buildout/buildout.py	2010-03-19 21:53:19 UTC (rev 110071)
@@ -909,8 +909,11 @@
         # the new dist is different, so we've upgraded.
         # Update the scripts and return True
         partsdir = os.path.join(options['parts-directory'], 'buildout')
-        if not os.path.exists(partsdir):
-            os.mkdir(partsdir)
+        if os.path.exists(partsdir):
+            # This is primarily for unit tests, in which .py files change too
+            # fast for Python to know to regenerate the .pyc/.pyo files.
+            shutil.rmtree(partsdir)
+        os.mkdir(partsdir)
         zc.buildout.easy_install.sitepackage_safe_scripts(
             options['bin-directory'], ws, sys.executable, partsdir,
             reqs=['zc.buildout'])