diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-12-22 20:58:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-26 11:34:09 +0000 |
commit | 9dc384ddfb418b82cf32a97ddc90c0634035e00c (patch) | |
tree | 2be8c024c48a3af0a666c646979092413d728902 /meta | |
parent | 36f83807731209e7d167add9a78df433278ee476 (diff) | |
download | poky-9dc384ddfb418b82cf32a97ddc90c0634035e00c.tar.gz |
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
(From OE-Core rev: 6c2962dc117304c542fd5458b39524ecdb81cae9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | 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 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 | |||
12 | gdk-pixbuf-query-loaders --update-cache | 12 | gdk-pixbuf-query-loaders --update-cache |
13 | 13 | ||
14 | for icondir in $D/usr/share/icons/*/ ; do | 14 | for icondir in $D/usr/share/icons/*/ ; do |
15 | gtk-update-icon-cache -fqt $icondir | 15 | if [ -d $icondir ] ; then |
16 | gtk-update-icon-cache -fqt $icondir | ||
17 | fi | ||
16 | done | 18 | done |
17 | EOF | 19 | EOF |
18 | fi | 20 | fi |