From 8924dce174465c882c7db71d2c064064a500c444 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Mon, 22 Apr 2013 11:01:24 +0300 Subject: [PATCH] pixbufcache.bbclass: do not exit 1 after installing intercept hook This will allow to register, in a single postinstall, multiple hooks. (From OE-Core rev: b396138ee081c8f5dddbaab0e374787ba2e31029) Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta/classes/pixbufcache.bbclass | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass index 3c34557..4e0f577 100644 --- a/meta/classes/pixbufcache.bbclass +++ b/meta/classes/pixbufcache.bbclass @@ -8,27 +8,22 @@ inherit qemu PIXBUF_PACKAGES ??= "${PN}" -# -# On host, the postinstall MUST return 1 because we do not know if the intercept -# hook will succeed. If it does succeed, than the packages will be marked as -# installed. -# pixbufcache_common() { if [ "x$D" != "x" ]; then $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} libdir=${libdir} \ bindir=${bindir} base_libdir=${base_libdir} - exit 1 -fi - -# Update the pixbuf loaders in case they haven't been registered yet -GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache - -if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then - for icondir in /usr/share/icons/*; do - if [ -d ${icondir} ]; then - gtk-update-icon-cache -t -q ${icondir} - fi - done +else + + # Update the pixbuf loaders in case they haven't been registered yet + GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache + + if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then + for icondir in /usr/share/icons/*; do + if [ -d ${icondir} ]; then + gtk-update-icon-cache -t -q ${icondir} + fi + done + fi fi } -- 2.7.4