Merge pull request #83 from reinout/remove-dumppickedversions-note

Removed buildout.dumppickedversions from the warning. Partial fix for #70

src/zc/buildout/buildout.py

@@ -956,11 +956,12 @@ class Buildout(DictMixin):
         for superceded_extension in ['buildout-versions',
                                      'buildout.dumppickedversions']:
             if superceded_extension in specs:
-                msg = ("The extension %s is now included in buildout itself.\n"
+                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.")
-                raise zc.buildout.UserError(msg % superceded_extension)
+                       "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:

src/zc/buildout/repeatable.txt

@@ -408,7 +408,7 @@ The versions file contains the extra pin:
     >>> 'spam = 2' in open('my_versions.cfg').read()
     True
 
-Because buildout now includes buildout-versions' (and the older
+Because buildout now includes buildout-versions' (and part of the older
 buildout.dumppickedversions') functionality, it warns if these extensions are
 configured.
 
@@ -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.