diff options
| author | PJ Eby <distutils-sig@python.org> | 2007-01-09 18:09:12 +0000 | 
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2007-01-09 18:09:12 +0000 | 
| commit | 605ef54cbe1f8475b3e0d45679a43cb2e454892a (patch) | |
| tree | 4826207a6292d18b970a36f32f1504a3d0754d8d /setuptools/command/bdist_wininst.py | |
| parent | e3c117aca3735a4a791ef06ae471ec9b7be078de (diff) | |
| download | python-setuptools-git-605ef54cbe1f8475b3e0d45679a43cb2e454892a.tar.gz | |
Don't double-upload .exe files under Python 2.5.  :(
(backport from trunk)
--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4053310
Diffstat (limited to 'setuptools/command/bdist_wininst.py')
| -rwxr-xr-x | setuptools/command/bdist_wininst.py | 36 | 
1 files changed, 18 insertions, 18 deletions
diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py index d2a8a4b1..0e06106a 100755 --- a/setuptools/command/bdist_wininst.py +++ b/setuptools/command/bdist_wininst.py @@ -2,24 +2,24 @@ from distutils.command.bdist_wininst import bdist_wininst as _bdist_wininst  import os  class bdist_wininst(_bdist_wininst): - -    def create_exe(self, arcname, fullname, bitmap=None): - -        _bdist_wininst.create_exe(self, arcname, fullname, bitmap) - -        if self.target_version: -            installer_name = os.path.join(self.dist_dir, -                                          "%s.win32-py%s.exe" % -                                           (fullname, self.target_version)) -            pyversion = self.target_version -        else: -            installer_name = os.path.join(self.dist_dir, -                                          "%s.win32.exe" % fullname) -            pyversion = 'any' - -        getattr(self.distribution,'dist_files',[]).append( -            ('bdist_wininst', pyversion, installer_name) -        ) +    if sys.version<'2.5': +        def create_exe(self, arcname, fullname, bitmap=None): + +            _bdist_wininst.create_exe(self, arcname, fullname, bitmap) + +            if self.target_version: +                installer_name = os.path.join(self.dist_dir, +                                              "%s.win32-py%s.exe" % +                                               (fullname, self.target_version)) +                pyversion = self.target_version +            else: +                installer_name = os.path.join(self.dist_dir, +                                              "%s.win32.exe" % fullname) +                pyversion = 'any' + +            getattr(self.distribution,'dist_files',[]).append( +                ('bdist_wininst', pyversion, installer_name) +            )      def reinitialize_command (self, command, reinit_subcommands=0):          cmd = self.distribution.reinitialize_command(  | 
