From ed1cbc9fa803599ad9d4a69edd3b0eefd2d9278e Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 28 Feb 2011 13:29:15 +0000 Subject: 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. (From OE-Core rev: f781c35da9a11eefdb06bda72ca89753df863efa) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'meta/classes/sstate.bbclass') diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index d367faaa7b..b4873f0f3d 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) -- cgit v1.2.3-54-g00ecf