[Checkins] SVN: bluebream/ cleaner option switch for distribute (thx srichter)

[Christophe Combelles]

Log message for revision 110444:
  cleaner option switch for distribute (thx srichter)
  

Changed:
  U   bluebream/trunk/bootstrap.py
  U   bluebream/trunk/src/bluebream/bluebream_base/project_template/bootstrap.py
  U   bluebream/website/bootstrap.py

-=-
Modified: bluebream/trunk/bootstrap.py
===================================================================
--- bluebream/trunk/bootstrap.py	2010-04-01 22:20:27 UTC (rev 110443)
+++ bluebream/trunk/bootstrap.py	2010-04-01 23:08:48 UTC (rev 110444)
@@ -31,13 +31,13 @@
 parser = OptionParser()
 parser.add_option("-v", "--version", dest="version",
                           help="use a specific zc.buildout version")
-parser.add_option("--setuptools",
-                   action="store_true", dest="setuptools", default=False,
-                   help="Use Setuptools rather than Distribute.")
 parser.add_option("-d", "--distribute",
                    action="store_true", dest="distribute", default=True,
                    help="For backward compatibility. "
                         "Distribute is used by default.")
+parser.add_option("--setuptools",
+                   action="store_false", dest="distribute", default=True,
+                   help="Use Setuptools rather than Distribute.")
 parser.add_option("-c", None, action="store", dest="config_file",
                    help=("Specify the path to the buildout configuration "
                          "file to be used."))
@@ -54,8 +54,6 @@
     VERSION = ''
 
 USE_DISTRIBUTE = options.distribute
-if options.setuptools:
-    USE_DISTRIBUTE = False
 args = args + ['bootstrap']
 
 to_reload = False

Modified: bluebream/trunk/src/bluebream/bluebream_base/project_template/bootstrap.py
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/bootstrap.py	2010-04-01 22:20:27 UTC (rev 110443)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/bootstrap.py	2010-04-01 23:08:48 UTC (rev 110444)
@@ -31,13 +31,13 @@
 parser = OptionParser()
 parser.add_option("-v", "--version", dest="version",
                           help="use a specific zc.buildout version")
-parser.add_option("--setuptools",
-                   action="store_true", dest="setuptools", default=False,
-                   help="Use Setuptools rather than Distribute.")
 parser.add_option("-d", "--distribute",
                    action="store_true", dest="distribute", default=True,
                    help="For backward compatibility. "
                         "Distribute is used by default.")
+parser.add_option("--setuptools",
+                   action="store_false", dest="distribute", default=True,
+                   help="Use Setuptools rather than Distribute.")
 parser.add_option("-c", None, action="store", dest="config_file",
                    help=("Specify the path to the buildout configuration "
                          "file to be used."))
@@ -54,8 +54,6 @@
     VERSION = ''
 
 USE_DISTRIBUTE = options.distribute
-if options.setuptools:
-    USE_DISTRIBUTE = False
 args = args + ['bootstrap']
 
 to_reload = False

Modified: bluebream/website/bootstrap.py
===================================================================
--- bluebream/website/bootstrap.py	2010-04-01 22:20:27 UTC (rev 110443)
+++ bluebream/website/bootstrap.py	2010-04-01 23:08:48 UTC (rev 110444)
@@ -32,9 +32,12 @@
 parser.add_option("-v", "--version", dest="version",
                           help="use a specific zc.buildout version")
 parser.add_option("-d", "--distribute",
-                   action="store_true", dest="distribute", default=False,
-                   help="Use Disribute rather than Setuptools.")
-
+                   action="store_true", dest="distribute", default=True,
+                   help="For backward compatibility. "
+                        "Distribute is used by default.")
+parser.add_option("--setuptools",
+                   action="store_false", dest="distribute", default=True,
+                   help="Use Setuptools rather than Distribute.")
 parser.add_option("-c", None, action="store", dest="config_file",
                    help=("Specify the path to the buildout configuration "
                          "file to be used."))