diff options
Diffstat (limited to 'classes/package.bbclass')
| -rw-r--r-- | classes/package.bbclass | 7 |
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) |