[Checkins] SVN: zc.buildout/branches/env-cache/src/zc/buildout/easy_install.py Was updating the dist cache in the wrong place.

Ross Patterson me at rpatterson.net
Sun Jan 29 05:23:16 UTC 2012


Log message for revision 124232:
  Was updating the dist cache in the wrong place.
  
  Sometimes buildout just copies the egg itself without calling
  easy_install.

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-29 05:23:07 UTC (rev 124231)
+++ zc.buildout/branches/env-cache/src/zc/buildout/easy_install.py	2012-01-29 05:23:16 UTC (rev 124232)
@@ -646,7 +646,6 @@
                 os.rename(d.location, newloc)
                 [d] = _get_env(self._executable, [newloc])[d.project_name]
                 result.append(d)
-                update_dist(path_item=self._dest, dist=d)
 
             return result
 
@@ -797,6 +796,7 @@
                             shutil.copyfile(dist.location, newloc)
 
                     redo_pyc(newloc)
+                    update_dist(path_item=self._dest, dist=dist)
 
                     # Getting the dist from the environment causes the
                     # distribution meta data to be read.  Cloning isn't
@@ -810,6 +810,7 @@
                         dist.location, ws, self._dest, dist)
                     for dist in dists:
                         redo_pyc(dist.location)
+                        update_dist(path_item=self._dest, dist=dist)
 
             finally:
                 if tmp != self._download_cache:



More information about the checkins mailing list