From: Martin Jansa Date: Sat, 22 Dec 2012 19:58:49 +0000 (+0100) Subject: gtk-icon-cache: don't call gtk-update-icon-cache on files X-Git-Tag: 2015-4~8219 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6c2962dc117304c542fd5458b39524ecdb81cae9;p=openembedded-core.git gtk-icon-cache: don't call gtk-update-icon-cache on files * check if icondir is directory before calling gtk-update-icon-cache, like all other calls do * fixes: | > Executing update_icon_cache | + chmod +x update_icon_cache | + ./update_icon_cache | gtk-update-icon-cache.real: Failed to open file /tmp-eglibc/work/qemuarm-oe-linux-gnueabi/shr-image-all/2.0-r20/rootfs/usr/share/icons/enjoy.png/.icon-theme.cache : Not a directory | gtk-update-icon-cache.real: Failed to open file /tmp-eglibc/work/qemuarm-oe-linux-gnueabi/shr-image-all/2.0-r20/rootfs/usr/share/icons/monav.png/.icon-theme.cache : Not a directory | gtk-update-icon-cache.real: Failed to open file /tmp-eglibc/work/qemuarm-oe-linux-gnueabi/shr-image-all/2.0-r20/rootfs/usr/share/icons/orrery.png/.icon-theme.cache : Not a directory Signed-off-by: Martin Jansa Signed-off-by: Saul Wold --- diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index f87a30fd5b..7c7dd78854 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass @@ -12,7 +12,9 @@ if [ "x$D" != "x" ]; then gdk-pixbuf-query-loaders --update-cache for icondir in $D/usr/share/icons/*/ ; do - gtk-update-icon-cache -fqt $icondir + if [ -d $icondir ] ; then + gtk-update-icon-cache -fqt $icondir + fi done EOF fi