sanity.bbclass: allow dash to be used as /bin/sh, but print a warning

[vuplus_openembedded] / classes / package_ipk.bbclass

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 99f3793..d4cb3b6 100644 (file)
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -245,7 +245,7 @@ python do_package_ipk () {
                rreplaces = (bb.data.getVar("RREPLACES", localdata, 1) or "").split()
                rconflicts = (bb.data.getVar("RCONFLICTS", localdata, 1) or "").split()
 
-               if not '-locale-' and not '-dbg' and not '-dev' in pkgname
+               if not '-locale-' and not '-dbg' and not '-dev' in pkgname:
                        rdepends.append('%s-locale*' % pkgname)
 
                if rdepends:
@@ -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)
 }