diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-03 15:28:11 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-03 15:28:27 +0100 |
| commit | a6ce10e83ed637c0e39cd4fcf567042f75cd1157 (patch) | |
| tree | 07140f10fccb0b44983020ece00ee1c9e9f73938 /meta/classes/sstate.bbclass | |
| parent | 7e36135a7e39e0ddb7298ffdec31b0f2be011788 (diff) | |
| download | openembedded-core-a6ce10e83ed637c0e39cd4fcf567042f75cd1157.tar.gz openembedded-core-a6ce10e83ed637c0e39cd4fcf567042f75cd1157.tar.bz2 openembedded-core-a6ce10e83ed637c0e39cd4fcf567042f75cd1157.zip | |
sstate: Handle symlink directory entries correctly
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes/sstate.bbclass')
| -rw-r--r-- | meta/classes/sstate.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
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) |