[Checkins] SVN: zc.buildout/branches/gary-support-system-python/ try to explain how the two kinds of bootstrap options work a bit better

[Gary Poster]

Log message for revision 101778:
  try to explain how the two kinds of bootstrap options work a bit better

Changed:
  U   zc.buildout/branches/gary-support-system-python/bootstrap/bootstrap.py
  U   zc.buildout/branches/gary-support-system-python/src/zc/buildout/bootstrap.txt

-=-
Modified: zc.buildout/branches/gary-support-system-python/bootstrap/bootstrap.py
===================================================================
--- zc.buildout/branches/gary-support-system-python/bootstrap/bootstrap.py	2009-07-09 19:52:45 UTC (rev 101777)
+++ zc.buildout/branches/gary-support-system-python/bootstrap/bootstrap.py	2009-07-10 00:55:19 UTC (rev 101778)
@@ -33,6 +33,12 @@
     '--eggs': None}
 
 helpstring = __doc__ + textwrap.dedent('''
+    This script recognizes the following options itself.  The first option it
+    encounters that is not one of these will cause the script to stop parsing
+    options and pass the rest on to buildout.  Therefore, if you want to use
+    any of the following options *and* buildout command-line options like
+    -c, first use the following options, and then use the buildout options.
+
     Options: 
       --version=ZC_BUILDOUT_VERSION
                 Specify a version number of the zc.buildout to use
@@ -48,8 +54,8 @@
                 directory that is deleted when the bootstrap script completes.
 
     By using --ez_setup-source and --download-base to point to local resources,
-    you can keep bootstrap from going over the network.
-    ''')
+    you can keep this script from going over the network.
+    ''' % configuration)
 match_equals = re.compile(r'(%s)=(\S*)' % ('|'.join(configuration),)).match
 args = sys.argv[1:]
 if args == ['--help']:

Modified: zc.buildout/branches/gary-support-system-python/src/zc/buildout/bootstrap.txt
===================================================================
--- zc.buildout/branches/gary-support-system-python/src/zc/buildout/bootstrap.txt	2009-07-09 19:52:45 UTC (rev 101777)
+++ zc.buildout/branches/gary-support-system-python/src/zc/buildout/bootstrap.txt	2009-07-10 00:55:19 UTC (rev 101778)
@@ -165,13 +165,19 @@
     <BLANKLINE>
     ...
     <BLANKLINE>
+    This script recognizes the following options itself.  The first option it
+    encounters that is not one of these will cause the script to stop parsing
+    options and pass the rest on to buildout.  Therefore, if you want to use
+    any of the following options *and* buildout command-line options like
+    -c, first use the following options, and then use the buildout options.
+    <BLANKLINE>
     Options: 
       --version=ZC_BUILDOUT_VERSION
                 Specify a version number of the zc.buildout to use
       --ez_setup-source=URL_OR_FILE
                 Specify a URL or file location for the ez_setup file.
                 Defaults to
-                %(--ez_setup-source)s
+                http://peak.telecommunity.com/dist/ez_setup.py
       --download-base=URL_OR_DIRECTORY
                 Specify a URL or directory for downloading setuptools and
                 zc.buildout.  Defaults to PyPI.
@@ -180,7 +186,8 @@
                 directory that is deleted when the bootstrap script completes.
     <BLANKLINE>
     By using --ez_setup-source and --download-base to point to local resources,
-    you can keep bootstrap from going over the network.
+    you can keep this script from going over the network.
     <BLANKLINE>
     <BLANKLINE>
 
+