easy_install doesn't use a setup.cfg located in the working dir - fixes #99

--HG--
branch : distribute
extra : rebase_source : 0ddcfcf2eb8ef650c248a1d5d86fe1b95100df10

1 files changed, 7 insertions, 1 deletions

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index de6ea945..fb8cd74f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1674,7 +1674,6 @@ def bootstrap():
     import setuptools; argv0 = os.path.dirname(setuptools.__path__[0])
     sys.argv[0] = argv0; sys.argv.append(argv0); main()
 
-
 def main(argv=None, **kw):
     from setuptools import setup
     from setuptools.dist import Distribution
@@ -1699,9 +1698,16 @@ usage: %(script)s [options] requirement_or_url ...
 
     class DistributionWithoutHelpCommands(Distribution):
         common_usage = ""
+
         def _show_help(self,*args,**kw):
             with_ei_usage(lambda: Distribution._show_help(self,*args,**kw))
 
+        def find_config_files(self):
+            files = Distribution.find_config_files(self)
+            if 'setup.cfg' in files:
+                files.remove('setup.cfg')
+            return files
+
     if argv is None:
         argv = sys.argv[1:]