summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-02-28 13:29:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-15 13:18:06 +0000
commitf781c35da9a11eefdb06bda72ca89753df863efa (patch)
treebfa9a65e1f19ef4402286dfc7800cbe6f39e0489
parentea743ea30e2289733d27979e8ec921648342da0e (diff)
downloadopenembedded-core-f781c35da9a11eefdb06bda72ca89753df863efa.tar.gz
openembedded-core-f781c35da9a11eefdb06bda72ca89753df863efa.tar.bz2
openembedded-core-f781c35da9a11eefdb06bda72ca89753df863efa.tar.xz
openembedded-core-f781c35da9a11eefdb06bda72ca89753df863efa.zip
sstate.bbclass: always delete stamp files in sstate_clean
For safety, always delete the stamp files in sstate_clean regardless of whether the manifest file exists or not. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--meta/classes/sstate.bbclass16
1 files changed, 7 insertions, 9 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index d367faaa7..b4873f0f3 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -229,17 +229,15 @@ def sstate_clean(ss, d):
manifest = bb.data.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'], d)
- if not os.path.exists(manifest):
- return
+ if os.path.exists(manifest):
+ locks = []
+ for lock in ss['lockfiles']:
+ locks.append(bb.utils.lockfile(lock))
- locks = []
- for lock in ss['lockfiles']:
- locks.append(bb.utils.lockfile(lock))
+ sstate_clean_manifest(manifest, d)
- sstate_clean_manifest(manifest, d)
-
- for lock in locks:
- bb.utils.unlockfile(lock)
+ for lock in locks:
+ bb.utils.unlockfile(lock)
stfile = d.getVar("STAMP", True) + ".do_" + ss['task']
oe.path.remove(stfile)