diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-09-13 14:29:58 +0200 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-09-13 14:29:58 +0200 |
| commit | ddd787ae1c7f77b4c8c52176ed1f228dc94ebbe6 (patch) | |
| tree | 181d10584b8683bc743ee25fc4c3c40a6e598c7d /setuptools/command/easy_install.py | |
| parent | 1a8b650faf34b6205a8a26168ab7ef886833f85c (diff) | |
| parent | 3c6ebb2ab608930ea3d1e54476344a990526e64a (diff) | |
| download | python-setuptools-git-ddd787ae1c7f77b4c8c52176ed1f228dc94ebbe6.tar.gz | |
Merge upstream changes.
--HG--
branch : distribute
extra : rebase_source : d68cc866146d65e1951fe88f526f94a64f17b1da
Diffstat (limited to 'setuptools/command/easy_install.py')
| -rwxr-xr-x | setuptools/command/easy_install.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 9e1f8711..195139c7 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1097,7 +1097,7 @@ Please make the appropriate changes for your system and try again.""" % ( return # already did it, or don't need to sitepy = os.path.join(self.install_dir, "site.py") - source = resource_string(Requirement.parse("setuptools"), "site.py") + source = resource_string(Requirement.parse("distribute"), "site.py") current = "" if os.path.exists(sitepy): |