| Index: native_client_sdk/src/build_tools/sdk_tools/sdk_update.py
|
| diff --git a/native_client_sdk/src/build_tools/sdk_tools/sdk_update.py b/native_client_sdk/src/build_tools/sdk_tools/sdk_update.py
|
| index ac423a5e5d20787a5551d1813740bd34bc099309..45c72f4a6ca9bf6dec5b46e60afdb80383cef168 100755
|
| --- a/native_client_sdk/src/build_tools/sdk_tools/sdk_update.py
|
| +++ b/native_client_sdk/src/build_tools/sdk_tools/sdk_update.py
|
| @@ -15,7 +15,7 @@ script forwards its arguments to sdk_updater_main.py.
|
|
|
| import os
|
| import subprocess
|
| -from sdk_update_common import *
|
| +from sdk_update_common import RenameDir, RemoveDir, Error
|
| import sys
|
| import tempfile
|
|
|
| @@ -83,7 +83,7 @@ def RenameSdkToolsDirectory():
|
| # Failed for some reason, move the old dir back.
|
| try:
|
| RenameDir(temp_sdktools, SDK_TOOLS_DIR)
|
| - except:
|
| + except Error:
|
| # Not much to do here. sdk_tools won't exist, but sdk_tools_update
|
| # should. Hopefully running the batch script again will move
|
| # sdk_tools_update -> sdk_tools and it will work this time...
|
| @@ -104,7 +104,7 @@ def main():
|
| return subprocess.call([NACLSDK_SHELL_SCRIPT] + args)
|
| else:
|
| return subprocess.call(MakeSdkUpdateMainCmd(args))
|
| -
|
| +
|
|
|
| if __name__ == '__main__':
|
| sys.exit(main())
|
|
|