Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.rebootstrap
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.rebootstrap
Commits
198edb16
Commit
198edb16
authored
May 05, 2017
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stop using needless easy_install._safe_arg.
parent
9cc19ea9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
slapos/rebootstrap/__init__.py
slapos/rebootstrap/__init__.py
+3
-3
No files found.
slapos/rebootstrap/__init__.py
View file @
198edb16
...
@@ -67,7 +67,7 @@ Buildout will be restarted automatically to have this change applied.
...
@@ -67,7 +67,7 @@ Buildout will be restarted automatically to have this change applied.
"""
%
dict
(
wanted_python
=
self
.
wanted_python
,
"""
%
dict
(
wanted_python
=
self
.
wanted_python
,
running_python
=
self
.
running_python
)
running_python
=
self
.
running_python
)
self
.
logger
.
info
(
message
)
self
.
logger
.
info
(
message
)
args
=
map
(
zc
.
buildout
.
easy_install
.
_safe_arg
,
sys
.
argv
)
args
=
sys
.
argv
[:]
env
=
os
.
environ
env
=
os
.
environ
if
'ORIG_PYTHON'
not
in
env
:
if
'ORIG_PYTHON'
not
in
env
:
env
[
'ORIG_PYTHON'
]
=
sys
.
executable
env
[
'ORIG_PYTHON'
]
=
sys
.
executable
...
@@ -78,7 +78,7 @@ Buildout will be restarted automatically to have this change applied.
...
@@ -78,7 +78,7 @@ Buildout will be restarted automatically to have this change applied.
self
.
rebootstrap_directory
!=
self
.
buildout
[
'buildout'
][
'directory'
]:
self
.
rebootstrap_directory
!=
self
.
buildout
[
'buildout'
][
'directory'
]:
self
.
logger
.
info
(
'Installing section %r to provide %r'
%
(
self
.
logger
.
info
(
'Installing section %r to provide %r'
%
(
self
.
python_section
,
self
.
wanted_python
))
self
.
python_section
,
self
.
wanted_python
))
args
=
map
(
zc
.
buildout
.
easy_install
.
_safe_arg
,
sys
.
argv
)
args
=
sys
.
argv
[:]
if
'install'
in
args
:
if
'install'
in
args
:
args
=
args
[:
args
.
index
(
'install'
)]
args
=
args
[:
args
.
index
(
'install'
)]
...
@@ -146,7 +146,7 @@ Buildout will be restarted automatically with the original Python.
...
@@ -146,7 +146,7 @@ Buildout will be restarted automatically with the original Python.
self
.
_logger
.
info
(
message
)
self
.
_logger
.
info
(
message
)
if
getattr
(
self
,
'dry_run'
,
False
):
if
getattr
(
self
,
'dry_run'
,
False
):
sys
.
exit
()
sys
.
exit
()
args
=
map
(
zc
.
buildout
.
easy_install
.
_safe_arg
,
sys
.
argv
)
args
=
sys
.
argv
[:]
env
=
os
.
environ
env
=
os
.
environ
orig_python
=
env
[
'ORIG_PYTHON'
]
orig_python
=
env
[
'ORIG_PYTHON'
]
os
.
execve
(
orig_python
,
[
orig_python
]
+
args
,
env
)
os
.
execve
(
orig_python
,
[
orig_python
]
+
args
,
env
)
...
...
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