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

[phillip.eby]

Author: phillip.eby
Date: Thu Sep 21 23:02:21 2006
New Revision: 51957

Modified:
   sandbox/branches/setuptools-0.6/EasyInstall.txt
   sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
Log:
Fix easy_install not recognizing win32.exe files that include a custom bitmap.
(backport from trunk)


Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/EasyInstall.txt	(original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt	Thu Sep 21 23:02:21 2006
@@ -1194,6 +1194,10 @@
 Release Notes/Change History
 ============================
 
+0.6c4
+ * Fixed not recogninzing ``win32.exe`` installers that included a custom
+   bitmap.
+
 0.6c3
  * You once again use "python -m easy_install" with Python 2.4 and above.
 

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 Sep 21 23:02:21 2006
@@ -1249,7 +1249,7 @@
         if tag not in (0x1234567A, 0x1234567B):
             return None     # not a valid tag
 
-        f.seek(prepended-(12+cfglen+bmlen))
+        f.seek(prepended-(12+cfglen))
         cfg = ConfigParser.RawConfigParser({'version':'','target_version':''})
         try:
             cfg.readfp(StringIO.StringIO(f.read(cfglen).split(chr(0),1)[0]))