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
Łukasz Nowak
slapos.buildout
Commits
064a757e
Commit
064a757e
authored
Nov 01, 2009
by
Tarek Ziad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make sure the -c option can be used over bootstrap (passed to buildout.main)
parent
84fd6b6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
0 deletions
+25
-0
bootstrap/bootstrap.py
bootstrap/bootstrap.py
+8
-0
src/zc/buildout/bootstrap.txt
src/zc/buildout/bootstrap.txt
+17
-0
No files found.
bootstrap/bootstrap.py
View file @
064a757e
...
@@ -35,8 +35,16 @@ parser.add_option("-d", "--distribute",
...
@@ -35,8 +35,16 @@ parser.add_option("-d", "--distribute",
action
=
"store_true"
,
dest
=
"distribute"
,
default
=
False
,
action
=
"store_true"
,
dest
=
"distribute"
,
default
=
False
,
help
=
"Use Disribute rather than Setuptools."
)
help
=
"Use Disribute rather than Setuptools."
)
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
,
args
=
parser
.
parse_args
()
# if -c was provided, we push it back into args for buildout' main function
if
options
.
config_file
is
not
None
:
args
+=
[
'-c'
,
options
.
config_file
]
if
options
.
version
is
not
None
:
if
options
.
version
is
not
None
:
VERSION
=
'==%s'
%
options
.
version
VERSION
=
'==%s'
%
options
.
version
else
:
else
:
...
...
src/zc/buildout/bootstrap.txt
View file @
064a757e
...
@@ -178,3 +178,20 @@ Let's make sure the generated `buildout` script uses ``Distribute`` *and* ``zc.b
...
@@ -178,3 +178,20 @@ Let's make sure the generated `buildout` script uses ``Distribute`` *and* ``zc.b
zc.buildout.buildout.main()
zc.buildout.buildout.main()
<BLANKLINE>
<BLANKLINE>
Last, the -c option needs to work on bootstrap.py::
>>> conf_file = os.path.join(sample_buildout, 'other.cfg')
>>> f = open(conf_file, 'w')
>>> f.write('[buildout]\nparts=\n\n')
>>> f.close()
>>> print 'X'; print system(
... zc.buildout.easy_install._safe_arg(sys.executable)+' '+
... 'bootstrap.py -c %s --distribute' % conf_file); print 'X' # doctest: +ELLIPSIS
...
X
...
Generated script '/sample/bin/buildout'.
<BLANKLINE>
X
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