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
a03a28da
Commit
a03a28da
authored
Jun 03, 2012
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes in response to pull-request comments
parent
ec55b025
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
11 deletions
+12
-11
bootstrap/bootstrap.py
bootstrap/bootstrap.py
+1
-3
dev.py
dev.py
+1
-1
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+6
-5
src/zc/buildout/isolation.txt
src/zc/buildout/isolation.txt
+4
-2
No files found.
bootstrap/bootstrap.py
View file @
a03a28da
...
...
@@ -57,7 +57,7 @@ options, args = parser.parse_args()
# handle -S
def
normpath
(
p
):
return
p
[:
-
1
]
if
p
.
endswith
(
'/'
)
else
p
return
p
[:
-
1
]
if
p
.
endswith
(
os
.
path
.
sep
)
else
p
nosite
=
'site'
not
in
sys
.
modules
if
nosite
:
...
...
@@ -153,8 +153,6 @@ if version:
requirement
=
'=='
.
join
((
requirement
,
version
))
cmd
.
append
(
requirement
)
print
'requirement'
,
requirement
import
subprocess
if
subprocess
.
call
(
cmd
,
env
=
env
)
!=
0
:
raise
Exception
(
...
...
dev.py
View file @
a03a28da
...
...
@@ -30,7 +30,7 @@ if os.path.isdir('build'):
# handle -S
def
normpath
(
p
):
return
p
[:
-
1
]
if
p
.
endswith
(
'/'
)
else
p
return
p
[:
-
1
]
if
p
.
endswith
(
os
.
path
.
sep
)
else
p
nosite
=
'site'
not
in
sys
.
modules
if
nosite
:
...
...
src/zc/buildout/easy_install.py
View file @
a03a28da
...
...
@@ -18,13 +18,15 @@ It doesn't install scripts. It uses distribute and requires it to be
installed.
"""
import
os
import
sys
######################################################################
# handle -S
def
normpath
(
p
):
return
p
[:
-
1
]
if
p
.
endswith
(
'/'
)
else
p
return
p
[:
-
1
]
if
p
.
endswith
(
os
.
path
.
sep
)
else
p
no_site
=
'site'
not
in
sys
.
modules
if
no_site
:
initial_paths
=
set
(
map
(
normpath
,
sys
.
path
))
...
...
@@ -36,7 +38,6 @@ if no_site:
import
distutils.errors
import
glob
import
logging
import
os
import
pkg_resources
import
py_compile
import
re
...
...
src/zc/buildout/isolation.txt
View file @
a03a28da
...
...
@@ -16,7 +16,8 @@ applications:
2. Use a 'virtual environment
<http://pypi.python.org/pypi/virtualenv>'_ that wraps a Python
installation in a way that hides 3rd-party modules.
installation in a way that hides 3rd-party modules. `This is buildt
into Python 3.3 <http://docs.python.org/dev/library/venv.html>`_
3. Use the -S Python option when bootstrapping buildout. This will
bypass the normal execution of the Python site.py file, which is
...
...
@@ -125,4 +126,5 @@ The -S option is also used when invoking setup scripts.
3rd-party libraries that are added to the Python path regardless of
whether site.py is loaded. Still, even on Mac OS X, use of the -S
option prevents some 3rd-party modules from being added to the
Python path,
Python path.
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