[Checkins] SVN: zc.buildout/branches/env-cache/src/zc/buildout/easy_install.py Remove cached envs when copying develop eggs.

Ross Patterson me at rpatterson.net
Sat Jan 21 10:06:36 UTC 2012


Log message for revision 124117:
  Remove cached envs when copying develop eggs.
  
  This fixes many of the failures, but I still have a few ideas about a
  more appropriate fix.

Changed:
  U   zc.buildout/branches/env-cache/src/zc/buildout/easy_install.py

-=-
Modified: zc.buildout/branches/env-cache/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/env-cache/src/zc/buildout/easy_install.py	2012-01-21 10:06:22 UTC (rev 124116)
+++ zc.buildout/branches/env-cache/src/zc/buildout/easy_install.py	2012-01-21 10:06:36 UTC (rev 124117)
@@ -1191,7 +1191,13 @@
         except subprocess.CalledProcessError:
             raise zc.buildout.UserError("Installing develop egg failed")
             
-        return _copyeggs(tmp3, dest, '.egg-link', undo)
+        result = _copyeggs(tmp3, dest, '.egg-link', undo)
+        python = _get_version(executable)
+        for key in _envs.keys():
+            cached_python, cached_path = key
+            if cached_python == python and dest in cached_path:
+                del _envs[key]
+        return result
 
     finally:
         undo.reverse()



More information about the checkins mailing list