diff options
| author | tarek <none@none> | 2009-07-21 18:59:54 +0200 |
|---|---|---|
| committer | tarek <none@none> | 2009-07-21 18:59:54 +0200 |
| commit | b2723a86bbbf1ab74f49c2849111464f50b8ce4a (patch) | |
| tree | 8dceb0092d6960f7c91b41d8718921ee14628093 | |
| parent | 3d4f3060886dd7ef9b074df9667fbabf4760fd2a (diff) | |
| download | external_python_setuptools-b2723a86bbbf1ab74f49c2849111464f50b8ce4a.tar.gz external_python_setuptools-b2723a86bbbf1ab74f49c2849111464f50b8ce4a.tar.bz2 external_python_setuptools-b2723a86bbbf1ab74f49c2849111464f50b8ce4a.zip | |
fixed distribution key in check_version_conflict. I first thaught it was the #36 issue of setuptools but it's not.
--HG--
branch : distribute
extra : rebase_source : 87a541261be9881f95e7d62308f99f89f6319dd9
| -rw-r--r-- | pkg_resources.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index 0150a0cb..6679a109 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -2253,7 +2253,7 @@ class Distribution(object): def check_version_conflict(self): - if self.key=='setuptools': + if self.key=='distribute': return # ignore the inevitable setuptools self-conflicts :( nsp = dict.fromkeys(self._get_metadata('namespace_packages.txt')) |