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
isaak yansane-sisk
slapos.buildout
Commits
81c504f2
Commit
81c504f2
authored
Aug 23, 2012
by
Domen Kožar
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
1bccc54d
d09f9f55
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
7 deletions
+17
-7
.gitignore
.gitignore
+9
-0
MANIFEST.in
MANIFEST.in
+1
-1
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+4
-2
src/zc/buildout/testing.py
src/zc/buildout/testing.py
+3
-4
No files found.
.gitignore
0 → 100644
View file @
81c504f2
.installed.cfg
bin/
build/
develop-eggs/
eggs/
parts/
*.pyc
*.egg
*.egg-info
\ No newline at end of file
MANIFEST.in
View file @
81c504f2
include *.txt
recursive-include src *.txt
exclude MANIFEST.in buildout.cfg .bzrignore
exclude MANIFEST.in buildout.cfg .bzrignore
.gitignore
src/zc/buildout/buildout.py
View file @
81c504f2
...
...
@@ -976,10 +976,10 @@ class Buildout(UserDict.DictMixin):
)
# Restart
args
=
map
(
zc
.
buildout
.
easy_install
.
_safe_arg
,
sys
.
argv
)
args
=
list
(
sys
.
argv
)
if
not
__debug__
:
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
# buildout, so we put the partsdir in PYTHONPATH for our restart.
# This overrides any set PYTHONPATH, but since we generally are
...
...
@@ -987,6 +987,8 @@ class Buildout(UserDict.DictMixin):
# library) then that should be fine.
env
=
os
.
environ
.
copy
()
env
[
'PYTHONPATH'
]
=
partsdir
# windows: Popen will quote args itself if needed
# see subprocess.list2cmdline
sys
.
exit
(
subprocess
.
Popen
(
args
,
env
=
env
).
wait
())
def
_load_extensions
(
self
):
...
...
src/zc/buildout/testing.py
View file @
81c504f2
...
...
@@ -151,8 +151,7 @@ def _runsetup(setup, executable, *args):
setup = os.path.join(setup, '
setup
.
py
')
d = os.path.dirname(setup)
args = [zc.buildout.easy_install._safe_arg(arg)
for arg in args]
args = list(args)
args.insert(0, '
-
q
')
env = dict(os.environ)
if executable == sys.executable:
...
...
@@ -163,9 +162,9 @@ def _runsetup(setup, executable, *args):
try:
os.chdir(d)
p = subprocess.Popen(
[
zc.buildout.easy_install._safe_arg(executable)
, setup] + args,
[
executable
, setup] + args,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
close_fds=
True
, env=env)
close_fds=
MUST_CLOSE_FDS
, env=env)
out = p.stdout.read()
if p.wait():
print out
...
...
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