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
Xavier Thompson
slapos.buildout
Commits
8e0b6463
Commit
8e0b6463
authored
Sep 22, 2023
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP Ignore buuildout path for bootstrap install
parent
5c99921b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+1
-0
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+7
-2
No files found.
src/zc/buildout/buildout.py
View file @
8e0b6463
...
@@ -631,6 +631,7 @@ class Buildout(DictMixin):
...
@@ -631,6 +631,7 @@ class Buildout(DictMixin):
path
=
path
,
path
=
path
,
newest
=
self
.
newest
,
newest
=
self
.
newest
,
allow_hosts
=
self
.
_allow_hosts
,
allow_hosts
=
self
.
_allow_hosts
,
include_buildout_path
=
False
,
)
)
else
:
else
:
# Now copy buildout and setuptools eggs, and record destination eggs:
# Now copy buildout and setuptools eggs, and record destination eggs:
...
...
src/zc/buildout/easy_install.py
View file @
8e0b6463
...
@@ -255,6 +255,7 @@ class Installer(object):
...
@@ -255,6 +255,7 @@ class Installer(object):
allow_hosts
=
(
'*'
,),
allow_hosts
=
(
'*'
,),
check_picked
=
True
,
check_picked
=
True
,
allow_unknown_extras
=
False
,
allow_unknown_extras
=
False
,
include_buildout_path
=
True
,
):
):
assert
executable
==
sys
.
executable
,
(
executable
,
sys
.
executable
)
assert
executable
==
sys
.
executable
,
(
executable
,
sys
.
executable
)
self
.
_dest
=
dest
if
dest
is
None
else
pkg_resources
.
normalize_path
(
dest
)
self
.
_dest
=
dest
if
dest
is
None
else
pkg_resources
.
normalize_path
(
dest
)
...
@@ -275,7 +276,9 @@ class Installer(object):
...
@@ -275,7 +276,9 @@ class Installer(object):
links
.
insert
(
0
,
self
.
_download_cache
)
links
.
insert
(
0
,
self
.
_download_cache
)
self
.
_index_url
=
index
self
.
_index_url
=
index
path
=
(
path
and
path
[:]
or
[])
+
buildout_and_setuptools_path
path
=
(
path
and
path
[:]
or
[])
if
include_buildout_path
:
path
+=
buildout_and_setuptools_path
self
.
_path
=
path
self
.
_path
=
path
if
self
.
_dest
is
None
:
if
self
.
_dest
is
None
:
newest
=
False
newest
=
False
...
@@ -957,6 +960,7 @@ def install(specs, dest,
...
@@ -957,6 +960,7 @@ def install(specs, dest,
allowed_eggs_from_site_packages
=
None
,
allowed_eggs_from_site_packages
=
None
,
check_picked
=
True
,
check_picked
=
True
,
allow_unknown_extras
=
False
,
allow_unknown_extras
=
False
,
include_buildout_path
=
True
,
):
):
assert
executable
==
sys
.
executable
,
(
executable
,
sys
.
executable
)
assert
executable
==
sys
.
executable
,
(
executable
,
sys
.
executable
)
assert
include_site_packages
is
None
assert
include_site_packages
is
None
...
@@ -967,7 +971,8 @@ def install(specs, dest,
...
@@ -967,7 +971,8 @@ def install(specs, dest,
newest
,
versions
,
use_dependency_links
,
newest
,
versions
,
use_dependency_links
,
allow_hosts
=
allow_hosts
,
allow_hosts
=
allow_hosts
,
check_picked
=
check_picked
,
check_picked
=
check_picked
,
allow_unknown_extras
=
allow_unknown_extras
)
allow_unknown_extras
=
allow_unknown_extras
,
include_buildout_path
=
include_buildout_path
)
return
installer
.
install
(
specs
,
working_set
)
return
installer
.
install
(
specs
,
working_set
)
buildout_and_setuptools_dists
=
list
(
install
([
'zc.buildout'
],
None
,
buildout_and_setuptools_dists
=
list
(
install
([
'zc.buildout'
],
None
,
...
...
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