From 82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40 Mon Sep 17 00:00:00 2001 From: Mattias Hansson Date: Tue, 10 Apr 2018 16:44:51 +0200 Subject: lib/bb/utils: prevent movefile from changing dest dir permissions Prevent movefile from falsely setting the source file's owner and permissions on the destination directory instead of the destination file when moving between devices. This bug caused the last file moved into a directory to dictate the directory's owner and permissions. Signed-off-by: Mattias Hansson Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- lib/bb/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 8b739d784..378e699e0 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -807,8 +807,8 @@ def movefile(src, dest, newmtime = None, sstat = None): return None # failure try: if didcopy: - os.lchown(dest, sstat[stat.ST_UID], sstat[stat.ST_GID]) - os.chmod(dest, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset on chown + os.lchown(destpath, sstat[stat.ST_UID], sstat[stat.ST_GID]) + os.chmod(destpath, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset on chown os.unlink(src) except Exception as e: print("movefile: Failed to chown/chmod/unlink", dest, e) -- cgit 1.2.3-korg