summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Bradford <rob@openedhand.com>2008-10-20 14:58:47 +0000
committerRobert Bradford <rob@openedhand.com>2008-10-20 14:58:47 +0000
commit7ddbeb29315ccc93cebf10c3f52663110f5b8168 (patch)
tree6738882e9b7527215e71733167483d7464a919bd /meta
parentc9fe18a6cb7f3fa6d2a66052d85a7fc4a0854952 (diff)
downloadpoky-7ddbeb29315ccc93cebf10c3f52663110f5b8168.tar.gz
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
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/packaged-staging.bbclass3
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):
88 88
89 for walkroot, dirs, files in os.walk(src): 89 for walkroot, dirs, files in os.walk(src):
90 for file in files: 90 for file in files:
91 # Avoid breaking the held lock
92 if (file == "staging.lock"):
93 continue
91 filepath = os.path.join(walkroot, file).replace(src, dest) 94 filepath = os.path.join(walkroot, file).replace(src, dest)
92 bb.note("rm %s" % filepath) 95 bb.note("rm %s" % filepath)
93 os.system("rm %s" % filepath) 96 os.system("rm %s" % filepath)