summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2007-01-29 10:18:07 +0000
committerPhil Blundell <philb@gnu.org>2007-01-29 10:18:07 +0000
commitaf748babde67c02ed56134e5aecf16ec474d762e (patch)
treeaba8fd7201447e3744bd1213ce0def3bc59fe078
parent9d15b95ba5ce645156381004224b595129347f3b (diff)
package.bbclass: add workaround for wrongly globbed symlinks in FILES causing python
traceback spew during population
-rw-r--r--classes/package.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index d328aac63c..59b78878ba 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -408,11 +408,16 @@ python populate_packages () {
fpath = os.path.join(root,file)
dpath = os.path.dirname(fpath)
bb.mkdirhier(dpath)
+ if file in cleandirs:
+ cleandirs.remove(file)
ret = bb.movefile(file,fpath)
if ret is None or ret == 0:
raise bb.build.FuncFailed("File population failed")
for dir in cleandirs:
- os.rmdir(dir)
+ if os.path.isdir(dir):
+ os.rmdir(dir)
+ else:
+ bb.note("ERROR: directory %s went away unexpectedly during package population" % dir)
del localdata
os.chdir(workdir)