utils: Allow copyfile to copy files which aren't readable

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index 92ec433334ab9d7233b1ae8d97de86ecdb3b7374..22793a9f654b84a817a93c75b201738f22f3450d 100644 (file)
--- a/lib/bb/utils.py
+++ b/lib/bb/utils.py
@@ -731,11 +731,14 @@ 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.
             shutil.copyfile(src, dest + "#new")
             os.rename(dest + "#new", dest)
         except Exception as e:
             print('copyfile: copy', src, '->', dest, 'failed.', e)
+            os.chmod(src, stat.S_IMODE(sstat[stat.ST_MODE]))
+            os.utime(src, (sstat[stat.ST_ATIME], sstat[stat.ST_MTIME]))
             return False
         finally:
             os.chmod(src, sstat[stat.ST_MODE])