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
88eb2032
Commit
88eb2032
authored
Aug 18, 2012
by
Domen Kožar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bootstrap.py to correctly handle bootstrap and init commands
parent
126938e4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
3 deletions
+24
-3
CHANGES.txt
CHANGES.txt
+5
-0
bootstrap/bootstrap.py
bootstrap/bootstrap.py
+7
-3
src/zc/buildout/bootstrap.txt
src/zc/buildout/bootstrap.txt
+12
-0
No files found.
CHANGES.txt
View file @
88eb2032
...
...
@@ -4,6 +4,11 @@ Change History
1.6.1 (xxx)
===========
- `bootstrap.py -d init` would invoke buildout with arguments
`init bootstrap` leading into installation of bootstrap package.
now bootstrap.py first runs any commands passed, then tries to
bootstrap. (Domen Kožar)
- fix Python 2.4 support (Domen Kožar)
- added travis-ci testing (Domen Kožar)
...
...
bootstrap/bootstrap.py
View file @
88eb2032
...
...
@@ -134,7 +134,9 @@ parser.add_option("-c", None, action="store", dest="config_file",
help
=
(
"Specify the path to the buildout configuration "
"file to be used."
))
options
,
args
=
parser
.
parse_args
()
options
,
orig_args
=
parser
.
parse_args
()
args
=
[]
# if -c was provided, we push it back into args for buildout's main function
if
options
.
config_file
is
not
None
:
...
...
@@ -153,7 +155,6 @@ if options.setup_source is None:
if
options
.
accept_buildout_test_releases
:
args
.
append
(
'buildout:accept-buildout-test-releases=true'
)
args
.
append
(
'bootstrap'
)
try
:
import
pkg_resources
...
...
@@ -257,6 +258,9 @@ if exitcode != 0:
ws
.
add_entry
(
eggs_dir
)
ws
.
require
(
requirement
)
import
zc.buildout.buildout
zc
.
buildout
.
buildout
.
main
(
args
)
if
orig_args
:
# run buildout with commands passed to bootstrap.py, then actually bootstrap
zc
.
buildout
.
buildout
.
main
(
args
+
orig_args
)
zc
.
buildout
.
buildout
.
main
(
args
+
[
'bootstrap'
])
if
not
options
.
eggs
:
# clean up temporary egg directory
shutil
.
rmtree
(
eggs_dir
)
src/zc/buildout/bootstrap.txt
View file @
88eb2032
...
...
@@ -347,3 +347,15 @@ Here's the entire help text.
or betas.
-c CONFIG_FILE Specify the path to the buildout configuration file to
be used.
Rebootstrap and create config file.
>>> remove('buildout.cfg')
>>> print system(
... zc.buildout.easy_install._safe_arg(sys.executable) +
... ' bootstrap.py init') # doctest: +NORMALIZE_WHITESPACE
Creating '/sample/buildout.cfg'.
>>> cat('buildout.cfg') # doctest: +NORMALIZE_WHITESPACE
[buildout]
parts =
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