From b2723a86bbbf1ab74f49c2849111464f50b8ce4a Mon Sep 17 00:00:00 2001
From: tarek <none@none>
Date: Tue, 21 Jul 2009 18:59:54 +0200
Subject: 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
---
 pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkg_resources.py')

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'))
-- 
cgit v1.2.3