- Prevent running of the dart_bootstrap script by default.

tools/observatory_tool.py

 #!/usr/bin/env python
 # Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 """Helper for building and deploying Observatory"""
 
 import argparse
 import os
 import platform
 import shutil
@@ skipping 18 matching lines @@
 
 usage = """observatory_tool.py [options]"""
 
 def BuildArguments():
   result = argparse.ArgumentParser(usage=usage)
   result.add_argument("--package-root", help="package root", default=None)
   result.add_argument("--dart-executable", help="dart executable", default=None)
   result.add_argument("--pub-executable", help="pub executable", default=None)
   result.add_argument("--directory", help="observatory root", default=None)
   result.add_argument("--command", help="[get, build, deploy]", default=None)
-  result.add_argument("--silent", help="silence all output", default=False)
-  result.add_argument("--sdk", help="Use prebuilt sdk", default=False)
+  result.add_argument("--silent", help="silence all output", default=None)
+  result.add_argument("--sdk", help="Use prebuilt sdk", default=None)
   return result
 
 def ProcessOptions(options, args):
+  # Fix broken boolean parsing in argparse, where False ends up being True.
+  if (options.silent is not None) and (options.silent == "True"):
+    options.silent = True
+  elif (options.silent is None) or (options.silent == "False"):
+    options.silent = False
+  else:
+    print "--silent expects 'True' or 'False' argument."
+    return False
+
+  if (options.sdk is not None) and (options.sdk == "True"):
+    options.sdk = True
+  elif (options.sdk is None) or (options.sdk == "False"):
+    options.sdk = False
+  else:
+    print "--sdk expects 'True' or 'False' argument."
+    return False
+
   with open(os.devnull, 'wb') as silent_sink:
     # Required options.
     if options.command is None or options.directory is None:
       return False
 
     # Set a default value for pub_snapshot.
     options.pub_snapshot = None
 
     # If we have a working pub executable, try and use that.
     # TODO(whesse): Drop the pub-executable option if it isn't used.
     if options.pub_executable is not None:
       try:
         if 0 == subprocess.call([options.pub_executable, '--version'],
                                 stdout=silent_sink,
                                 stderr=silent_sink):
           return True
       except OSError as e:
         pass
     options.pub_executable = None
 
-    if options.sdk is not None and utils.CheckedInSdkCheckExecutable():
+    if options.sdk and utils.CheckedInSdkCheckExecutable():
       # Use the checked in pub executable.
       options.pub_snapshot = os.path.join(utils.CheckedInSdkPath(),
                                           'bin',
                                           'snapshots',
                                           'pub.dart.snapshot');
       try:
         if 0 == subprocess.call([utils.CheckedInSdkExecutable(),
                                  options.pub_snapshot,
                                  '--version'],
                                  stdout=silent_sink,
@@ skipping 11 matching lines @@
   os.chdir(directory);
 
 def DisplayBootstrapWarning():
   print """\
 
 
 WARNING: Your system cannot run the checked-in Dart SDK. Using the
 bootstrap Dart executable will make debug builds slow.
 Please see the Wiki for instructions on replacing the checked-in Dart SDK.
 
-https://github.com/dart-lang/sdk/wiki/The-checked-in-SDK-in--tools
+https://github.com/dart-lang/sdk/wiki/The-checked-in-SDK-in-tools
+
+To use the dart_bootstrap binary please update the PubCommand function
+in the tools/observatory_tool.py script.
 
 """
 
 def PubCommand(dart_executable,
                pub_executable,
                pub_snapshot,
                pkg_root,
                command,
                silent):
   with open(os.devnull, 'wb') as silent_sink:
     if pub_executable is not None:
       executable = [pub_executable]
     elif pub_snapshot is not None:
       executable = [utils.CheckedInSdkExecutable(), pub_snapshot]
     else:
       DisplayBootstrapWarning()
       executable = [dart_executable, '--package-root=' + pkg_root, PUB_PATH]
+      # Prevent the bootstrap Dart executable from running in regular
+      # development flow.
+      # REMOVE THE FOLLOWING LINE TO USE the dart_bootstrap binary.
+      return False
     return subprocess.call(executable + command,
                            stdout=silent_sink if silent else None,
                            stderr=silent_sink if silent else None)
 
 def Deploy(input_dir, output_dir):
   shutil.rmtree(output_dir)
   shutil.copytree(input_dir, output_dir, ignore=IGNORE_PATTERNS)
   index_file = os.path.join(output_dir, 'web', 'index.html')
   os.utime(index_file, None)
   return 0
@@ skipping 53 matching lines @@
   if (options.pub_snapshot != None):
     options.pub_snapshot = os.path.abspath(options.pub_snapshot)
   if len(args) == 1:
     args[0] = os.path.abspath(args[0])
   # Pub must be run from the project's root directory.
   ChangeDirectory(options.directory)
   return ExecuteCommand(options, args)
 
 if __name__ == '__main__':
   sys.exit(main());