[Checkins] SVN: zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.py eliminate spurious warning if you are using distribute.

Gary Poster gary.poster at canonical.com
Fri Jun 18 19:56:20 EDT 2010


Log message for revision 113629:
  eliminate spurious warning if you are using distribute.

Changed:
  U   zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.py

-=-
Modified: zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.py	2010-06-18 23:56:16 UTC (rev 113628)
+++ zc.buildout/branches/gary-betafix/src/zc/buildout/easy_install.py	2010-06-18 23:56:20 UTC (rev 113629)
@@ -818,7 +818,7 @@
     def _maybe_add_setuptools(self, ws, dist):
         if dist.has_metadata('namespace_packages.txt'):
             for r in dist.requires():
-                if r.project_name == 'setuptools':
+                if r.project_name in ('setuptools', 'distribute'):
                     break
             else:
                 # We have a namespace package but no requirement for setuptools



More information about the checkins mailing list