diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-25 17:22:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-25 17:24:34 +0000 |
commit | 9166b9e32fd6f618f9597b07d88cef09a88916a1 (patch) | |
tree | 8fc6b42575c15bec9866e10a5ded7aa5bc368a8a | |
parent | b931aaa678920036f8959f6ec0cb710232f20def (diff) | |
download | ast2050-yocto-poky-9166b9e32fd6f618f9597b07d88cef09a88916a1.zip ast2050-yocto-poky-9166b9e32fd6f618f9597b07d88cef09a88916a1.tar.gz |
bitbake/utils.py: Only try and add read access to a file if we don't have it
A file we're copying might be on a readonly filesystem so if we can already read
it, don't try and add read permission.
Fixes BUGID #771 in Yocto.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/utils.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 44419d8..a6f1337 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -773,16 +773,23 @@ def copyfile(src, dest, newmtime = None, sstat = None): return False if stat.S_ISREG(sstat[stat.ST_MODE]): - os.chmod(src, stat.S_IRUSR) # Make sure we can read it - try: # For safety copy then move it over. + try: + srcchown = False + if not os.access(src, os.R_OK): + # Make sure we can read it + srcchown = True + os.chmod(src, sstat[stat.ST_MODE] | stat.S_IRUSR) + + # For safety copy then move it over. shutil.copyfile(src, dest + "#new") os.rename(dest + "#new", dest) except Exception as e: print('copyfile: copy', src, '->', dest, 'failed.', e) return False finally: - os.chmod(src, sstat[stat.ST_MODE]) - os.utime(src, (sstat[stat.ST_ATIME], sstat[stat.ST_MTIME])) + if srcchown: + os.chmod(src, sstat[stat.ST_MODE]) + os.utime(src, (sstat[stat.ST_ATIME], sstat[stat.ST_MTIME])) else: #we don't yet handle special, so we need to fall back to /bin/mv |