Roll version of gsutil to 4.15.

third_party/gsutil/gslib/command_runner.py

 # -*- coding: utf-8 -*-
 # Copyright 2011 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
@@ skipping 23 matching lines @@
 from gslib.command import OLD_ALIAS_MAP
 from gslib.command import ShutDownGsutil
 import gslib.commands
 from gslib.cs_api_map import ApiSelector
 from gslib.cs_api_map import GsutilApiClassMapFactory
 from gslib.cs_api_map import GsutilApiMapFactory
 from gslib.exception import CommandException
 from gslib.gcs_json_api import GcsJsonApi
 from gslib.no_op_credentials import NoOpCredentials
 from gslib.tab_complete import MakeCompleter
+from gslib.util import CheckMultiprocessingAvailableAndInit
 from gslib.util import CompareVersions
 from gslib.util import GetGsutilVersionModifiedTime
 from gslib.util import GSUTIL_PUB_TARBALL
 from gslib.util import IsRunningInteractively
 from gslib.util import LAST_CHECKED_FOR_GSUTIL_UPDATE_TIMESTAMP_FILE
 from gslib.util import LookUpGsutilVersion
-from gslib.util import MultiprocessingIsAvailable
 from gslib.util import RELEASE_NOTES_URL
 from gslib.util import SECONDS_PER_DAY
 from gslib.util import UTF8
 
 
 def HandleArgCoding(args):
   """Handles coding of command-line args.
 
   Args:
     args: array of command-line args.
@@ skipping 131 matching lines @@
         for subcommand, arguments in subcommand_argument_dict.iteritems():
           subcommand_parser = subcommand_parsers.add_parser(
               subcommand, add_help=False)
           self._ConfigureCommandArgumentParserArguments(
               subcommand_parser, arguments, gsutil_api)
       else:
         self._ConfigureCommandArgumentParserArguments(
             command_parser, command.command_spec.argparse_arguments, gsutil_api)
 
   def RunNamedCommand(self, command_name, args=None, headers=None, debug=0,
-                      parallel_operations=False, test_method=None,
+                      trace_token=None, parallel_operations=False,
                       skip_update_check=False, logging_filters=None,
                       do_shutdown=True):
     """Runs the named command.
 
     Used by gsutil main, commands built atop other commands, and tests.
 
     Args:
       command_name: The name of the command being run.
       args: Command-line args (arg0 = actual arg, not command name ala bash).
       headers: Dictionary containing optional HTTP headers to pass to boto.
       debug: Debug level to pass in to boto connection (range 0..3).
+      trace_token: Trace token to pass to the underlying API.
       parallel_operations: Should command operations be executed in parallel?
-      test_method: Optional general purpose method for testing purposes.
-                   Application and semantics of this method will vary by
-                   command and test type.
       skip_update_check: Set to True to disable checking for gsutil updates.
       logging_filters: Optional list of logging.Filters to apply to this
                        command's logger.
       do_shutdown: Stop all parallelism framework workers iff this is True.
 
     Raises:
       CommandException: if errors encountered.
 
     Returns:
       Return value(s) from Command that was run.
     """
+    command_changed_to_update = False
     if (not skip_update_check and
         self.MaybeCheckForAndOfferSoftwareUpdate(command_name, debug)):
       command_name = 'update'
+      command_changed_to_update = True
       args = ['-n']
 
     if not args:
       args = []
 
     # Include api_version header in all commands.
     api_version = boto.config.get_value('GSUtil', 'default_api_version', '1')
     if not headers:
       headers = {}
     headers['x-goog-api-version'] = api_version
@@ skipping 22 matching lines @@
         if arg in subcommands:
           new_args.append(arg)
           break  # Take the first match and throw away the rest.
       args = new_args
       command_name = 'help'
 
     args = HandleArgCoding(args)
 
     command_class = self.command_map[command_name]
     command_inst = command_class(
-        self, args, headers, debug, parallel_operations,
+        self, args, headers, debug, trace_token, parallel_operations,
         self.bucket_storage_uri_class, self.gsutil_api_class_map_factory,
-        test_method, logging_filters, command_alias_used=command_name)
+        logging_filters, command_alias_used=command_name)
     return_code = command_inst.RunCommand()
 
-    if MultiprocessingIsAvailable()[0] and do_shutdown:
+    if CheckMultiprocessingAvailableAndInit().is_available and do_shutdown:
       ShutDownGsutil()
     if GetFailureCount() > 0:
       return_code = 1
+    if command_changed_to_update:
+      # If the command changed to update, the user's original command was
+      # not executed.
+      return_code = 1
+      print '\n'.join(textwrap.wrap(
+          'Update was successful. Exiting with code 1 as the original command '
+          'issued prior to the update was not executed and should be re-run.'))
     return return_code
 
   def MaybeCheckForAndOfferSoftwareUpdate(self, command_name, debug):
     """Checks the last time we checked for an update and offers one if needed.
 
     Offer is made if the time since the last update check is longer
     than the configured threshold offers the user to update gsutil.
 
     Args:
       command_name: The name of the command being run.
@@ skipping 79 matching lines @@
             'A newer version of gsutil (%s) is available than the version you '
             'are running (%s). A detailed log of gsutil release changes is '
             'available at %s if you would like to read them before updating.'
             % (cur_ver, gslib.VERSION, RELEASE_NOTES_URL)))
         if gslib.IS_PACKAGE_INSTALL:
           return False
         print
         answer = raw_input('Would you like to update [Y/n]? ')
         return not answer or answer.lower()[0] != 'n'
     return False