diff options
| author | Robert Bradford <rob@openedhand.com> | 2008-10-20 14:58:47 +0000 |
|---|---|---|
| committer | Robert Bradford <rob@openedhand.com> | 2008-10-20 14:58:47 +0000 |
| commit | 7ddbeb29315ccc93cebf10c3f52663110f5b8168 (patch) | |
| tree | 6738882e9b7527215e71733167483d7464a919bd | |
| parent | c9fe18a6cb7f3fa6d2a66052d85a7fc4a0854952 (diff) | |
| download | openembedded-core-7ddbeb29315ccc93cebf10c3f52663110f5b8168.tar.gz openembedded-core-7ddbeb29315ccc93cebf10c3f52663110f5b8168.tar.bz2 openembedded-core-7ddbeb29315ccc93cebf10c3f52663110f5b8168.zip | |
packaged-staging.bbclass: Avoid removing the staging.lock lock file.
The pstage_manualclean function can be called on a directory containing an
actively held lock on staging. Removing the lock file whilst the lock is held
results in a failure when the lock is released.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5553 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/classes/packaged-staging.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index a7dd1f80c1..690e41e1e2 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass @@ -88,6 +88,9 @@ def pstage_manualclean(srcname, destvarname, d): for walkroot, dirs, files in os.walk(src): for file in files: + # Avoid breaking the held lock + if (file == "staging.lock"): + continue filepath = os.path.join(walkroot, file).replace(src, dest) bb.note("rm %s" % filepath) os.system("rm %s" % filepath) |