[oe-commits] [meta-openembedded] 29/29: zile: fix do_install

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch morty-next
in repository meta-openembedded.

commit b40116cf457b88a2db14b86fda9627fb34d56ae6
Author: Martin Jansa <Martin.Jansa at gmail.com>
AuthorDate: Wed Mar 29 11:08:55 2017 +0200

    zile: fix do_install
    
    * --ignore-fail-on-non-empty works when the directory isn't empty, but still reports
      failure when the directory doesn't exist at all, like in:
      http://errors.yoctoproject.org/Errors/Details/138248/
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    (cherry picked from commit b8368598aed3e07cfb638b537e409bd0b3692df9)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-support/zile/zile_2.4.11.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/zile/zile_2.4.11.bb b/meta-oe/recipes-support/zile/zile_2.4.11.bb
index d5c555e..49fbaea 100644
--- a/meta-oe/recipes-support/zile/zile_2.4.11.bb
+++ b/meta-oe/recipes-support/zile/zile_2.4.11.bb
@@ -15,8 +15,8 @@ SRC_URI[sha256sum] = "1fd27bbddc61491b1fbb29a345d0d344734aa9e80cfa07b02892eedf83
 inherit autotools pkgconfig
 
 do_install_append() {
-        rm -rf ${D}${libdir}/charset.alias
-        rmdir --ignore-fail-on-non-empty ${D}${libdir}
+    rm -rf ${D}${libdir}/charset.alias
+    rmdir --ignore-fail-on-non-empty ${D}${libdir} || true
 }
 
 PACKAGECONFIG ??= ""

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.