summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrizzlynyo <grizzly.nyo@gmail.com>2015-11-21 15:15:23 +0200
committergrizzlynyo <grizzly.nyo@gmail.com>2015-11-21 15:15:23 +0200
commit3bdff2bfeecf1bc753a8472bcd146f3a33c3660d (patch)
treec48cd1c755275c6574cdbd3b82eaa99a8eb572a4
parentfb4e16dd7217067b72a54e35f146c1257f4df2de (diff)
downloadpython-setuptools-bitbucket-bdist_wininst_gui_scripts.tar.gz
fix an issue for bdist_wininst with gui_scripts:bdist_wininst_gui_scripts
The script header was always generated with non-gui executable. This was caused by by adjust_header assuming the executable is always an absolute path. Fixed by using find_executables() from distutils.
-rwxr-xr-xsetuptools/command/easy_install.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 45d180bb..7ceac03f 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -2137,10 +2137,13 @@ class WindowsScriptWriter(ScriptWriter):
pattern, repl = repl, pattern
pattern_ob = re.compile(re.escape(pattern), re.IGNORECASE)
new_header = pattern_ob.sub(string=orig_header, repl=repl)
- clean_header = new_header[2:-1].strip('"')
- if sys.platform == 'win32' and not os.path.exists(clean_header):
- # the adjusted version doesn't exist, so return the original
- return orig_header
+ if sys.platform == 'win32':
+ from distutils.spawn import find_executable
+
+ clean_header = new_header[2:-1].strip('"')
+ if not find_executable(clean_header):
+ # the adjusted version doesn't exist, so return the original
+ return orig_header
return new_header