From a43991d5309afc9bdfd700ed720eccf5807acead Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 13 Apr 2016 12:14:23 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta/classes') 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} } - - -- cgit v1.2.3-54-g00ecf