diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-09-25 19:35:46 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-26 15:02:28 +0100 |
commit | 6bc5925ea962ff68dcfac72c221b2445f71c78aa (patch) | |
tree | c6b0d14bcac71786f8c2d1525c65b31996efc6bc /scripts/relocate_sdk.py | |
parent | 04ced3d73881a17f2a65b6cd33e303e31519ad6c (diff) | |
download | ast2050-yocto-poky-6bc5925ea962ff68dcfac72c221b2445f71c78aa.zip ast2050-yocto-poky-6bc5925ea962ff68dcfac72c221b2445f71c78aa.tar.gz |
SDK: trap any IO errors in the relocate script
If the files being relocated are already used by other processes the
relocate script will fail with a traceback. This patch will trap any IO
errors when opening such a file and gracefully report them to the user.
Also change the exit code from 1 to -1 for a better adt-installer user
experience (like pointing the user to the adt_installer.log).
[YOCTO #3164]
(From OE-Core rev: 26daec758b2eaeb208356d5aa8a9a191bd366751)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/relocate_sdk.py')
-rwxr-xr-x | scripts/relocate_sdk.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/relocate_sdk.py b/scripts/relocate_sdk.py index b247e65..637ffe9 100755 --- a/scripts/relocate_sdk.py +++ b/scripts/relocate_sdk.py @@ -29,6 +29,7 @@ import sys import stat import os import re +import errno old_prefix = re.compile("##DEFAULT_INSTALL_DIR##") @@ -171,7 +172,7 @@ def change_dl_sysdirs(): # MAIN if len(sys.argv) < 4: - exit(1) + exit(-1) new_prefix = sys.argv[1] new_dl_path = sys.argv[2] @@ -184,7 +185,16 @@ for e in executables_list: else: os.chmod(e, perms|stat.S_IRWXU) - f = open(e, "r+b") + try: + f = open(e, "r+b") + except IOError as ioex: + if ioex.errno == errno.ETXTBSY: + print("Could not open %s. File used by another process.\nPlease "\ + "make sure you exit all processes that might use any SDK "\ + "binaries." % e) + else: + print("Could not open %s: %s(%d)" % (e, ioex.strerror, ioex.errno)) + exit(-1) arch = get_arch() if arch: |