[oe-commits] org.oe.dev package.bbclass: remove directories named in FILES from image after file

[pb commit]

package.bbclass: remove directories named in FILES from image after file 
migration

Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: e03e452c09311f78ce177e8febeb9963f30bc1ef
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e03e452c09311f78ce177e8febeb9963f30bc1ef
Files:
1
classes/package.bbclass
Diffs:

#
# mt diff -r27b46e6b2f1768296232a9d2ce04946cd1d5514e -re03e452c09311f78ce177e8febeb9963f30bc1ef
#
# 
# 
# patch "classes/package.bbclass"
#  from [e59caa16e5f65d4574477c54a942e64e26296223]
#    to [edf00c41e2683d3180be274fedde142ed3837c83]
# 
============================================================
--- classes/package.bbclass	e59caa16e5f65d4574477c54a942e64e26296223
+++ classes/package.bbclass	edf00c41e2683d3180be274fedde142ed3837c83
@@ -387,6 +387,7 @@ python populate_packages () {
 		bb.mkdirhier(root)
 		filesvar = bb.data.getVar('FILES', localdata, 1) or ""
 		files = filesvar.split()
+		cleandirs = []
 		for file in files:
 			if os.path.isabs(file):
 				file = '.' + file
@@ -395,6 +396,7 @@ python populate_packages () {
 					newfiles =  [ os.path.join(file,x) for x in os.listdir(file) ]
 					if newfiles:
 						files += newfiles
+						cleandirs = [file] + cleandirs
 						continue
 			globbed = glob.glob(file)
 			if globbed:
@@ -409,6 +411,8 @@ python populate_packages () {
 			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)
 		del localdata
 	os.chdir(workdir)