summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/utils.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 5eec787336..b62985dd7b 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -741,9 +741,12 @@ def movefile(src, dest, newmtime = None, sstat = None):
741 renamefailed = 1 741 renamefailed = 1
742 if sstat[stat.ST_DEV] == dstat[stat.ST_DEV]: 742 if sstat[stat.ST_DEV] == dstat[stat.ST_DEV]:
743 try: 743 try:
744 # os.rename needs to know the destination path with file name 744 # os.rename needs to know the dest path ending with file name
745 destfile = os.path.join(dest, os.path.basename(src)) 745 # so append the file name to a path only if it's a dir specified
746 os.rename(src, destfile) 746 srcfname = os.path.basename(src)
747 destpath = os.path.join(dest, srcfname) if os.path.isdir(dest) \
748 else dest
749 os.rename(src, destpath)
747 renamefailed = 0 750 renamefailed = 0
748 except Exception as e: 751 except Exception as e:
749 if e[0] != errno.EXDEV: 752 if e[0] != errno.EXDEV: