diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-09-13 14:28:34 +0200 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-09-13 14:28:34 +0200 |
| commit | 3c6ebb2ab608930ea3d1e54476344a990526e64a (patch) | |
| tree | edfddb93275be90c0e2effd551e3669bfbcd1347 /setuptools/command/easy_install.py | |
| parent | 5bf298f0e8b30f236b76997c66eee38de798f710 (diff) | |
| parent | 28c9b94a4da7a469bb726309bce461dd0843e744 (diff) | |
| download | external_python_setuptools-3c6ebb2ab608930ea3d1e54476344a990526e64a.tar.gz external_python_setuptools-3c6ebb2ab608930ea3d1e54476344a990526e64a.tar.bz2 external_python_setuptools-3c6ebb2ab608930ea3d1e54476344a990526e64a.zip | |
Merge upstream changes.
--HG--
branch : distribute
extra : rebase_source : 4f43f59bf581c692bfbe4b45a8567b089fa0173a
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): |