]> code.ossystems Code Review - openembedded-core.git/commitdiff
gtk-icon-cache: don't call gtk-update-icon-cache on files
authorMartin Jansa <martin.jansa@gmail.com>
Sat, 22 Dec 2012 19:58:49 +0000 (20:58 +0100)
committerSaul Wold <sgw@linux.intel.com>
Tue, 25 Dec 2012 22:00:22 +0000 (14:00 -0800)
* 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@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/classes/gtk-icon-cache.bbclass

index f87a30fd5b9a88f47b74c6907cb04d55ab3dbe0f..7c7dd788542542dd8fb3a191bfc374a41ec22dec 100644 (file)
@@ -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