From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 4 Mar 2009 13:12:23 +0000 (+0100)
Subject: package_ipk.bbclass: use bb.utils.prunedir to remove CONTROL directory
X-Git-Tag: Release-2010-05/1~3876^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bfe29a25496da5ea5ebc9b0314f4d38a53e6691;p=openembedded.git

package_ipk.bbclass: use bb.utils.prunedir to remove CONTROL directory

It was removing file by file before and did not removed conffiles file.
As a result package_rpm was not able to create package.
---

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 89d5071c09..d4cb3b62e2 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -297,16 +297,7 @@ python do_package_ipk () {
 			bb.utils.unlockfile(lf)
 			raise bb.build.FuncFailed("ipkg-build execution failed")
 
-		for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
-			scriptfile = os.path.join(controldir, script)
-			try:
-				os.remove(scriptfile)
-			except OSError:
-				pass
-		try:
-			os.rmdir(controldir)
-		except OSError:
-			pass
+		bb.utils.prunedir(controldir)
 		bb.utils.unlockfile(lf)
 }