From: Koen Kooi <koen@openembedded.org>
Date: Tue, 27 Feb 2007 09:32:09 +0000 (+0000)
Subject: package.bbclass: comment out the cleandir since it breaks constructions like "inherit... 
X-Git-Tag: Release-2010-05/1~9148
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21c5ceaeb3d8429f0392df5d0556199b7147b784;p=openembedded.git

package.bbclass: comment out the cleandir since it breaks constructions like "inherit package_ipk package_tar" and seems to interfere with do_split_packages
---

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 34f3993bbf..07fdb7f890 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -409,16 +409,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)
+#			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:
-			if os.path.isdir(dir):
-				os.rmdir(dir)
-			else:
-				bb.note("ERROR: directory %s went away unexpectedly during package population" % dir)
+#		for dir in cleandirs:
+#			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)