From: Richard Purdie <rpurdie@linux.intel.com>
Date: Fri, 3 Sep 2010 14:28:11 +0000 (+0100)
Subject: sstate: Handle symlink directory entries correctly
X-Git-Tag: 2011-1~4622
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a6ce10e83ed637c0e39cd4fcf567042f75cd1157;p=openembedded-core.git

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 57deaed18c..4668e57b32 100644
--- 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)