sstate: Handle symlink directory entries correctly

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 57deaed18c8f55ce40f5915332c4548b15e99673..4668e57b32a5f2f32d3a0fef10ed53ed8bcba60c 100644 (file)
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -170,8 +170,10 @@ def sstate_clean_manifest(manifest, d):
         entry = entry.strip()
         bb.debug(2, "Removing manifest: %s" % entry)
         if entry.endswith("/"):
-           if os.path.exists(entry) and len(os.listdir(entry)) == 0:
-              os.rmdir(entry)
+           if os.path.islink(entry[:-1]):
+              os.remove(entry[:-1])
+           elif os.path.exists(entry) and len(os.listdir(entry)) == 0:
+              os.rmdir(entry[:-1])
         else:
            oe.path.remove(entry)