From af748babde67c02ed56134e5aecf16ec474d762e Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Mon, 29 Jan 2007 10:18:07 +0000 Subject: package.bbclass: add workaround for wrongly globbed symlinks in FILES causing python traceback spew during population --- classes/package.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'classes') 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) -- cgit v1.2.3