diff options
| -rwxr-xr-x | EasyInstall.txt | 5 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index 5076396b..4431095f 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -1198,7 +1198,10 @@ Release Notes/Change History * EasyInstall no longer aborts the installation process if a URL it wants to retrieve can't be downloaded, unless the URL is an actual package download. Instead, it issues a warning and tries to keep going. - + + * Fixed distutils-style scripts originally built on Windows having their line + endings doubled when installed on any platform. + 0.6c5 * Fixed ``.dll`` files on Cygwin not having executable permisions when an egg is installed unzipped. diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index f718d3d4..ce716b0e 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -373,7 +373,7 @@ Please make the appropriate changes for your system and try again. for script_name in dist.metadata_listdir('scripts'): self.install_script( dist, script_name, - dist.get_metadata('scripts/'+script_name).replace('\r','\n') + '\n'.join(dist.get_metadata('scripts/'+script_name).splitlines()) ) self.install_wrapper_scripts(dist) |