diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-04-13 12:14:23 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-14 10:58:33 +0100 |
| commit | a43991d5309afc9bdfd700ed720eccf5807acead (patch) | |
| tree | 57f8da9c5b6d830fb20f07ebf1ccdad32199c613 | |
| parent | 2c81e17222bee3acdfb722a7aecb8f2b8f75422a (diff) | |
| download | openembedded-core-contrib-a43991d5309afc9bdfd700ed720eccf5807acead.tar.gz | |
rootfs-postcommands: handle broken links when writing manifest
If the manifest link is broken then os.path.exists() returns False so the link
isn't removed, resulting in the os.symlink() call failing as the file already
exists. Prevent this by using os.path.lexists to check that the symlink itself
exists, not the target.
(From OE-Core rev: 018e3f9f215607a1d7c9fb7780236cc467f3103b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 56e810fd6f..95d28afa30 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -225,7 +225,7 @@ python write_image_manifest () { if os.path.exists(manifest_name): manifest_link = deploy_dir + "/" + link_name + ".manifest" - if os.path.exists(manifest_link): + if os.path.lexists(manifest_link): if d.getVar('RM_OLD_IMAGE', True) == "1" and \ os.path.exists(os.path.realpath(manifest_link)): os.remove(os.path.realpath(manifest_link)) @@ -275,5 +275,3 @@ rootfs_check_host_user_contaminated () { rootfs_sysroot_relativelinks () { sysroot-relativelinks.py ${SDK_OUTPUT}/${SDKTARGETSYSROOT} } - - |