Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
slapos.buildout
Commits
342750f3
Commit
342750f3
authored
Jun 13, 2013
by
Tres Seaver
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/jaraco/buildout
into jaraco-master
parents
942dad3c
2ca76a48
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+6
-1
No files found.
src/zc/buildout/easy_install.py
View file @
342750f3
...
@@ -26,6 +26,7 @@ import pkg_resources
...
@@ -26,6 +26,7 @@ import pkg_resources
import
py_compile
import
py_compile
import
re
import
re
import
setuptools.archive_util
import
setuptools.archive_util
import
setuptools.command.easy_install
import
setuptools.command.setopt
import
setuptools.command.setopt
import
setuptools.package_index
import
setuptools.package_index
import
shutil
import
shutil
...
@@ -1104,6 +1105,10 @@ def _create_script(contents, dest):
...
@@ -1104,6 +1105,10 @@ def _create_script(contents, dest):
if
win32_exe
.
endswith
(
'-script'
):
if
win32_exe
.
endswith
(
'-script'
):
win32_exe
=
win32_exe
[:
-
7
]
# remove "-script"
win32_exe
=
win32_exe
[:
-
7
]
# remove "-script"
win32_exe
=
win32_exe
+
'.exe'
# add ".exe"
win32_exe
=
win32_exe
+
'.exe'
# add ".exe"
try
:
new_data
=
setuptools
.
command
.
easy_install
.
get_win_launcher
(
'cli'
)
except
AttributeError
:
# fall back for compatibility with older Distribute versions
new_data
=
pkg_resources
.
resource_string
(
'setuptools'
,
'cli.exe'
)
new_data
=
pkg_resources
.
resource_string
(
'setuptools'
,
'cli.exe'
)
if
(
not
os
.
path
.
exists
(
win32_exe
)
or
if
(
not
os
.
path
.
exists
(
win32_exe
)
or
(
open
(
win32_exe
,
'rb'
).
read
()
!=
new_data
)
(
open
(
win32_exe
,
'rb'
).
read
()
!=
new_data
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment