package_ipk.bbclass: use bb.utils.prunedir to remove CONTROL directory
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Mar 2009 13:12:23 +0000 (14:12 +0100)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Mar 2009 13:12:59 +0000 (14:12 +0100)
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

index 89d5071..d4cb3b6 100644 (file)
@@ -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)
 }