Commit bfa7af9a authored by Reinout van Rees's avatar Reinout van Rees

Re-instated buildout.dumppickedversions into the warning.

Reworded the warning.
parent 8d86fe3a
......@@ -953,13 +953,15 @@ class Buildout(DictMixin):
def _load_extensions(self):
__doing__ = 'Loading extensions.'
specs = self['buildout'].get('extensions', '').split()
if 'buildout-versions' in specs:
raise zc.buildout.UserError(
"The extension 'buildout-versions' is now included in "
"buildout itself.\n"
for superceded_extension in ['buildout-versions',
'buildout.dumppickedversions']:
if superceded_extension in specs:
msg = ("Buildout now includes 'buildout-versions' (and part "
"of the older 'buildout.dumppickedversions').\n"
"Remove the extension from your configuration and "
"look at the `show-picked-versions`\n"
"option in buildout's documentation.")
"look at the 'show-picked-versions' option in "
"buildout's documentation.")
raise zc.buildout.UserError(msg)
if specs:
path = [self['buildout']['develop-eggs-directory']]
if self.offline:
......
......@@ -421,10 +421,11 @@ configured.
... [foo]
... recipe = spam
... """)
>>> print_(system(buildout), end='') # doctest: +ELLIPSIS
>>> print_(system(buildout), end='') # doctest: +NORMALIZE_WHITESPACE
While:
Installing.
Loading extensions.
Error: The extension 'buildout-versions' is now included in buildout itself.
Remove the extension from your configuration and look at the `show-picked-versions`
option in buildout's documentation.
Error: Buildout now includes 'buildout-versions'
(and part of the older 'buildout.dumppickedversions').
Remove the extension from your configuration and look at the
'show-picked-versions' option in buildout's documentation.
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