Fixed: the bootstrap command didn't honor the <2dev requirement

src/zc/buildout/buildout.py

@@ -352,7 +352,7 @@ class Buildout(UserDict.DictMixin):
 
         # Get a base working set for our distributions that corresponds to the
         # stated desires in the configuration.
-        distributions = ['setuptools', 'zc.buildout']
+        distributions = ['setuptools', 'zc.buildout<2dev']
         if options.get('offline') == 'true':
             ws = zc.buildout.easy_install.working_set(
                 distributions, options['executable'],

src/zc/buildout/tests.py

@@ -4328,7 +4328,7 @@ def test_suite():
 
     if os.path.exists(bootstrap_py):
         test_suite.append(doctest.DocFileSuite(
-            'bootstrap.txt',
+            'bootstrap.txt', 'bootstrap1.txt',
             setUp=bootstrapSetup,
             tearDown=zc.buildout.testing.buildoutTearDown,
             checker=renormalizing.RENormalizing([