[Python-checkins] r53612 - in sandbox/branches/setuptools-0.6: EasyInstall.txt setuptools/command/easy_install.py

[phillip.eby]

Author: phillip.eby
Date: Thu Feb  1 20:03:18 2007
New Revision: 53612

Modified:
   sandbox/branches/setuptools-0.6/EasyInstall.txt
   sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
Log:
Fixed distutils-style scripts originally built on Windows having their 
line endings doubled when installed on any platform. (backport)


Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/EasyInstall.txt	(original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt	Thu Feb  1 20:03:18 2007
@@ -1198,7 +1198,10 @@
  * 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.

Modified: sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py	Thu Feb  1 20:03:18 2007
@@ -373,7 +373,7 @@
             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)