[NaCl SDK] Refactor sdk_update*.

native_client_sdk/src/build_tools/sdk_tools/sdk_update.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Shim script for the SDK updater, to allow automatic updating.
 
 The purpose of this script is to be a shim which automatically updates
 sdk_tools (the bundle containing the updater scripts) whenever this script is
 run.
@@ skipping 34 matching lines @@
   """Run sdk_update_main to update sdk_tools bundle. Return True if it is
   updated.
 
   Args:
     args: The arguments to pass to sdk_update_main.py. We need to keep this to
         ensure sdk_update_main is called correctly; some parameters specify
         URLS or directories to use.
   Returns:
     True if the sdk_tools bundle was updated.
   """
-  cmd = MakeSdkUpdateMainCmd(['--update-sdk-tools'] + args)
+  cmd = MakeSdkUpdateMainCmd(args + ['--update-sdk-tools'])
   process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
   stdout, _ = process.communicate()
   if process.returncode == 0:
     return stdout.find('sdk_tools is already up-to-date.') == -1
   else:
     # Updating sdk_tools could fail for any number of reasons. Regardless, it
     # should be safe to try to run the user's command.
     return False
 
 
@@ skipping 35 matching lines @@
     RenameSdkToolsDirectory()
     # Call the shell script, just in case this script was updated in the next
     # version of sdk_tools
     return subprocess.call([NACLSDK_SHELL_SCRIPT] + args)
   else:
     return subprocess.call(MakeSdkUpdateMainCmd(args))
 
 
 if __name__ == '__main__':
   sys.exit(main())