[oe-commits] Martin Jansa : gtk-icon-cache: don't call gtk-update-icon-cache on files

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 6c2962dc117304c542fd5458b39524ecdb81cae9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6c2962dc117304c542fd5458b39524ecdb81cae9

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Sat Dec 22 20:58:49 2012 +0100

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 <Martin.Jansa at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/gtk-icon-cache.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index f87a30f..7c7dd78 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