Commit 064a757e authored by Tarek Ziad's avatar Tarek Ziad

make sure the -c option can be used over bootstrap (passed to buildout.main)

parent 84fd6b6b
......@@ -35,8 +35,16 @@ parser.add_option("-d", "--distribute",
action="store_true", dest="distribute", default=False,
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()
# 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:
VERSION = '==%s' % options.version
......@@ -178,3 +178,20 @@ Let's make sure the generated `buildout` script uses ``Distribute`` *and* ``zc.b
Last, the -c option needs to work on
>>> 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)+' '+
... ' -c %s --distribute' % conf_file); print 'X' # doctest: +ELLIPSIS
Generated script '/sample/bin/buildout'.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment