diff options
| author |   Mardegan, Alberto <AMardegan@luxoft.com> | 2017-09-21 14:33:52 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-25 14:14:17 +0100 |
| commit | e4dae6320506db320d236c6b45f14f15a7c71c17 (patch) | |
| tree | 746d2e29d787e6204a744405ef73c78409b875f2 /bitbake | |
| parent | 7a822506c0ae402f65c306ce10c05e195138c464 (diff) | |
| download | openembedded-core-contrib-e4dae6320506db320d236c6b45f14f15a7c71c17.tar.gz | |
bitbake: bitbake: lib/bb/utils: fix movefile() copy to dir fallback
When the destination is a directory, building the the destination file
path is always needed. That's because even if the copy fallback is
taken, it's always followed by a rename.
(Bitbake rev: 14c17480827ced2e03c1b62dc839696421fc4de8)
Signed-off-by: Alberto Mardegan <amardegan@luxoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/utils.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 8550af34ae..c540b49cf6 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -771,13 +771,14 @@ def movefile(src, dest, newmtime = None, sstat = None): return None renamefailed = 1 + # os.rename needs to know the dest path ending with file name + # so append the file name to a path only if it's a dir specified + srcfname = os.path.basename(src) + destpath = os.path.join(dest, srcfname) if os.path.isdir(dest) \ + else dest + if sstat[stat.ST_DEV] == dstat[stat.ST_DEV]: try: - # os.rename needs to know the dest path ending with file name - # so append the file name to a path only if it's a dir specified - srcfname = os.path.basename(src) - destpath = os.path.join(dest, srcfname) if os.path.isdir(dest) \ - else dest os.rename(src, destpath) renamefailed = 0 except Exception as e: @@ -791,8 +792,8 @@ def movefile(src, dest, newmtime = None, sstat = None): didcopy = 0 if stat.S_ISREG(sstat[stat.ST_MODE]): try: # For safety copy then move it over. - shutil.copyfile(src, dest + "#new") - os.rename(dest + "#new", dest) + shutil.copyfile(src, destpath + "#new") + os.rename(destpath + "#new", destpath) didcopy = 1 except Exception as e: print('movefile: copy', src, '->', dest, 'failed.', e) @@ -813,9 +814,9 @@ def movefile(src, dest, newmtime = None, sstat = None): return None if newmtime: - os.utime(dest, (newmtime, newmtime)) + os.utime(destpath, (newmtime, newmtime)) else: - os.utime(dest, (sstat[stat.ST_ATIME], sstat[stat.ST_MTIME])) + os.utime(destpath, (sstat[stat.ST_ATIME], sstat[stat.ST_MTIME])) newmtime = sstat[stat.ST_MTIME] return newmtime |