diff options
| author |   Benjamin Esquivel <benjamin.esquivel@linux.intel.com> | 2015-09-03 07:10:45 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-04 16:23:56 +0100 |
| commit | 7c079463c96891f0dbf6d7744c0d6bfe7af1e0ca (patch) | |
| tree | 099cae4a2c051d87c69c2eba27d49729470e38e0 /bitbake | |
| parent | ea3384e9f84388d60331ba24f67ce5716ce45ee0 (diff) | |
| download | openembedded-core-contrib-7c079463c96891f0dbf6d7744c0d6bfe7af1e0ca.tar.gz | |
bitbake: utils: Fix a potential error in movefile
bitbake utils' movefile is now prone to malform the destination
file with duplicated file name strings. Fixing it to force a file
name append iff the dest argument is a dir not a file name
(Bitbake rev: 38dd27f7191da002a16c561be3790ce487045b01)
Signed-off-by: Benjamin Esquivel <benjamin.esquivel@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/utils.py | 9 |
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): renamefailed = 1 if sstat[stat.ST_DEV] == dstat[stat.ST_DEV]: try: - # os.rename needs to know the destination path with file name - destfile = os.path.join(dest, os.path.basename(src)) - os.rename(src, destfile) + # 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: if e[0] != errno.EXDEV: |