Commit 689ae2d3 authored by hvelarde's avatar hvelarde

Replaced assertions with user error messages.

git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@123007 62d5b8a3-27da-0310-9561-8e5933582275
parent 825ae02e
...@@ -400,9 +400,10 @@ class Buildout(UserDict.DictMixin): ...@@ -400,9 +400,10 @@ class Buildout(UserDict.DictMixin):
relative_paths = options.get('relative-paths', 'false') relative_paths = options.get('relative-paths', 'false')
if relative_paths == 'true': if relative_paths == 'true':
relative_paths = options['directory'] relative_paths = options['directory']
else: elif relative_paths == 'false':
assert relative_paths == 'false'
relative_paths = '' relative_paths = ''
else:
raise zc.buildout.UserError("relative_paths must be true or false")
if (self.accept_buildout_test_releases and if (self.accept_buildout_test_releases and
self._annotated['buildout']['accept-buildout-test-releases'][1] == self._annotated['buildout']['accept-buildout-test-releases'][1] ==
'COMMAND_LINE_VALUE'): 'COMMAND_LINE_VALUE'):
...@@ -641,7 +642,7 @@ class Buildout(UserDict.DictMixin): ...@@ -641,7 +642,7 @@ class Buildout(UserDict.DictMixin):
self._save_installed_options(installed_part_options) self._save_installed_options(installed_part_options)
installed_exists = True installed_exists = True
else: else:
assert installed_exists assert installed_exists # nothing to tell the user here
self._update_installed(parts=' '.join(installed_parts)) self._update_installed(parts=' '.join(installed_parts))
if installed_develop_eggs: if installed_develop_eggs:
...@@ -962,9 +963,10 @@ class Buildout(UserDict.DictMixin): ...@@ -962,9 +963,10 @@ class Buildout(UserDict.DictMixin):
relative_paths = options.get('relative-paths', 'false') relative_paths = options.get('relative-paths', 'false')
if relative_paths == 'true': if relative_paths == 'true':
relative_paths = options['directory'] relative_paths = options['directory']
else: elif relative_paths == 'false':
assert relative_paths == 'false'
relative_paths = '' relative_paths = ''
else:
raise zc.buildout.UserError("relative_paths must be true or false")
zc.buildout.easy_install.sitepackage_safe_scripts( zc.buildout.easy_install.sitepackage_safe_scripts(
options['bin-directory'], ws, options['executable'], partsdir, options['bin-directory'], ws, options['executable'], partsdir,
reqs=['zc.buildout'], relative_paths=relative_paths, reqs=['zc.buildout'], relative_paths=relative_paths,
......
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