[Checkins] SVN: zc.buildout/trunk/src/zc/buildout/buildout.py Replaced assertions with user error messages.
Hector Edwardo Velade Diaz
hvelarde at yahoo.com
Mon Oct 3 07:59:15 EST 2011
Log message for revision 123007:
Replaced assertions with user error messages.
Changed:
U zc.buildout/trunk/src/zc/buildout/buildout.py
-=-
Modified: zc.buildout/trunk/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/buildout.py 2011-10-01 18:45:23 UTC (rev 123006)
+++ zc.buildout/trunk/src/zc/buildout/buildout.py 2011-10-03 12:59:14 UTC (rev 123007)
@@ -400,9 +400,10 @@
relative_paths = options.get('relative-paths', 'false')
if relative_paths == 'true':
relative_paths = options['directory']
+ elif relative_paths == 'false':
+ relative_paths = ''
else:
- assert relative_paths == 'false'
- relative_paths = ''
+ raise zc.buildout.UserError("relative_paths must be true or false")
if (self.accept_buildout_test_releases and
self._annotated['buildout']['accept-buildout-test-releases'][1] ==
'COMMAND_LINE_VALUE'):
@@ -641,7 +642,7 @@
self._save_installed_options(installed_part_options)
installed_exists = True
else:
- assert installed_exists
+ assert installed_exists # nothing to tell the user here
self._update_installed(parts=' '.join(installed_parts))
if installed_develop_eggs:
@@ -962,9 +963,10 @@
relative_paths = options.get('relative-paths', 'false')
if relative_paths == 'true':
relative_paths = options['directory']
+ elif relative_paths == 'false':
+ relative_paths = ''
else:
- assert relative_paths == 'false'
- relative_paths = ''
+ raise zc.buildout.UserError("relative_paths must be true or false")
zc.buildout.easy_install.sitepackage_safe_scripts(
options['bin-directory'], ws, options['executable'], partsdir,
reqs=['zc.buildout'], relative_paths=relative_paths,
More information about the checkins
mailing list