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
6
Merge Requests
6
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
6b0d2d9c
Commit
6b0d2d9c
authored
Aug 23, 2012
by
Adam Groszer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
windows: Popen will quote args itself if needed
parent
536d5a13
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+4
-2
No files found.
src/zc/buildout/buildout.py
View file @
6b0d2d9c
...
@@ -976,10 +976,10 @@ class Buildout(UserDict.DictMixin):
...
@@ -976,10 +976,10 @@ class Buildout(UserDict.DictMixin):
)
)
# Restart
# Restart
args
=
map
(
zc
.
buildout
.
easy_install
.
_safe_arg
,
sys
.
argv
)
args
=
list
(
sys
.
argv
)
if
not
__debug__
:
if
not
__debug__
:
args
.
insert
(
0
,
'-O'
)
args
.
insert
(
0
,
'-O'
)
args
.
insert
(
0
,
zc
.
buildout
.
easy_install
.
_safe_arg
(
sys
.
executable
)
)
args
.
insert
(
0
,
sys
.
executable
)
# We want to make sure that our new site.py is used for rerunning
# We want to make sure that our new site.py is used for rerunning
# buildout, so we put the partsdir in PYTHONPATH for our restart.
# buildout, so we put the partsdir in PYTHONPATH for our restart.
# This overrides any set PYTHONPATH, but since we generally are
# This overrides any set PYTHONPATH, but since we generally are
...
@@ -987,6 +987,8 @@ class Buildout(UserDict.DictMixin):
...
@@ -987,6 +987,8 @@ class Buildout(UserDict.DictMixin):
# library) then that should be fine.
# library) then that should be fine.
env
=
os
.
environ
.
copy
()
env
=
os
.
environ
.
copy
()
env
[
'PYTHONPATH'
]
=
partsdir
env
[
'PYTHONPATH'
]
=
partsdir
# windows: Popen will quote args itself if needed
# see subprocess.list2cmdline
sys
.
exit
(
subprocess
.
Popen
(
args
,
env
=
env
).
wait
())
sys
.
exit
(
subprocess
.
Popen
(
args
,
env
=
env
).
wait
())
def
_load_extensions
(
self
):
def
_load_extensions
(
self
):
...
...
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