[NaCl SDK] Refactor sdk_update*.

native_client_sdk/src/build_tools/build_sdk.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.
 
 """Entry point for both build and try bots
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 768 matching lines @@
     manifest_name = 'naclsdk_manifest2.json'
     with open(os.path.join(SERVER_DIR, manifest_name), 'wb') as \
         manifest_stream:
       manifest_stream.write(manifest.GetDataAsString())
 
     # use newly built sdk updater to pull this bundle
     buildbot_common.BuildStep('Update from local server')
     naclsdk_sh = os.path.join(OUT_DIR, 'nacl_sdk', 'naclsdk')
     if platform == 'win':
       naclsdk_sh += '.bat'
-    buildbot_common.Run([naclsdk_sh, '-U',
-        server.GetURL(manifest_name), 'update', 'pepper_' + pepper_ver])
+    buildbot_common.Run([naclsdk_sh, 'update', 'pepper_' + pepper_ver,
+        '-U', server.GetURL(manifest_name), '-v'])
 
     # Return the new pepper directory as the one inside the downloaded SDK.
     return os.path.join(OUT_DIR, 'nacl_sdk', 'pepper_' + pepper_ver)
 
   # kill server
   finally:
     if server:
       server.Shutdown()
 
 
@@ skipping 210 matching lines @@
       # Archive on non-trybots.
       if options.archive or buildbot_common.IsSDKBuilder():
         BuildStepArchiveBundle(pepper_ver, clnumber, tarfile)
         BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))