[oe-commits] Marcin Juszkiewicz : package_ipk.bbclass: use bb.utils. prunedir to remove CONTROL directory

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 5bfe29a25496da5ea5ebc9b0314f4d38a53e6691
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5bfe29a25496da5ea5ebc9b0314f4d38a53e6691

Author: Marcin Juszkiewicz <hrw at openembedded.org>
Date:   Wed Mar  4 14:12:23 2009 +0100

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.

---

 classes/package_ipk.bbclass |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 89d5071..d4cb3b6 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)
 }