Handle easy_install being run via -m with no __file__ if done from a

zipfile.

diff --git a/Lib/setuptools.egg-info/PKG-INFO b/Lib/setuptools.egg-info/PKG-INFO
index 0f3dc9f73c6be2adc09f705a49e2cd11b9916716..5da6b2e5b088edb24fea979e9594f2803c8b1211 100644 (file)
--- a/Lib/setuptools.egg-info/PKG-INFO
+++ b/Lib/setuptools.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: setuptools
-Version: 0.7a1dev-r45519
+Version: 0.7a1dev-r45521
 Summary: Download, build, install, upgrade, and uninstall Python packages -- easily!
 Home-page: http://peak.telecommunity.com/DevCenter/setuptools
 Author: Phillip J. Eby

diff --git a/Lib/setuptools/command/easy_install.py b/Lib/setuptools/command/easy_install.py
index 1af063da07d74fda7efd3eadb7dec7ec599db846..adb99b60a1d312f0d4d39801a8119952bbb263fa 100755 (executable)
--- a/Lib/setuptools/command/easy_install.py
+++ b/Lib/setuptools/command/easy_install.py
@@ -1549,6 +1549,7 @@ usage: %(script)s [options] requirement_or_url ...
     with_ei_usage(lambda:
         setup(
             script_args = ['-q','easy_install', '-v']+argv,
+            script_name = sys.argv[0] or 'easy_install',
             distclass=DistributionWithoutHelpCommands, **kw
         )
     )
@@ -1557,4 +1558,3 @@ usage: %(script)s [options] requirement_or_url ...
 
 
 
-