package_ipk/package_deb.bbclass: Make sure control files are properly removed fixing...

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5066 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 8f5fedada76b31af9433c1a4d040012c9798457e..28e67fcc9bf7268aec9b013d40600d0e9705ebe8 100644 (file)
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -247,17 +247,7 @@ python do_package_deb () {
             bb.utils.unlockfile(lf)
             raise bb.build.FuncFailed("dpkg-deb 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)
 }
 

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 790bba0fd0a4e7c764f972cd06b4c0c7fb253523..b4308d55a6e99974d91078e78b8a5824301c49f5 100644 (file)
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -285,16 +285,7 @@ python do_package_ipk () {
                        bb.utils.unlockfile(lf)
                        raise bb.build.FuncFailed("opkg-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)
 }