Hi All,
Please find below a fix for
http://defect.opensolaris.org/bz/show_bug.cgi?id=6617
A solution is to add a dependency to the icon-cache SMF service to
make sure
the pixbuf-loaders-installer service is started before icon-cache.
I've also removed the fatal error code returns as these errors are
not fatal and should only
be logged and shouldn't stop the service.
Thanks,
Erwann
Index: configure.in
===================================================================
--- configure.in (revision 32)
+++ configure.in (working copy)
@@ -1,4 +1,4 @@
-AC_INIT([desktop-cache-smf-services], [0.1.6])
+AC_INIT([desktop-cache-smf-services], [0.1.7])
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([1.9])
Index: ChangeLog
===================================================================
--- ChangeLog (revision 32)
+++ ChangeLog (working copy)
@@ -1,3 +1,12 @@
+2009-03-13 Erwann Chenede - <erwann.chenede at sun.com>
+
+ fix for 6617
+
+ * icon-cache/icon-cache.xml : added dependency on pixbuf-loaders
+ * icon-cache/icon-cache : don't stop the service as failue isn't
+ fatal only an error in the log should be reported.
+ * configure.in : bump version to 0.1.7
+
2009-02-02 Ghee Teo <ghee.teo at sun.com>
Uprev to 0.1.6. Now provide 'refresh' method properly and this is the
Index: icon-cache/icon-cache.xml
===================================================================
--- icon-cache/icon-cache.xml (revision 32)
+++ icon-cache/icon-cache.xml (working copy)
@@ -51,7 +51,15 @@
restart_on='none'>
<service_fmri value='svc:/system/filesystem/local' />
</dependency>
-
+
+ <!-- Need pixbuf-loaders installed before running -->
+ <dependency
+ name='pixbuf-loaders'
+ type='service'
+ grouping='require_all'
+ restart_on='none'>
+ <service_fmri
value='svc:/application/desktop-cache/pixbuf-loaders-installer' />
+ </dependency>
<!-- Need to be run before gdm is started -->
<dependent
name='icon-cache_gdm'
Index: icon-cache/icon-cache
===================================================================
--- icon-cache/icon-cache (revision 32)
+++ icon-cache/icon-cache (working copy)
@@ -78,7 +78,6 @@
if [ $? -ne 0 ]; then
echo "/usr/bin/gtk-update-icon-cache exited with an error while \
generating the icon cache for $DIR."
- exit $SMF_EXIT_ERR_FATAL
else
echo "Icon cache successfully generated in $DIR"
fi
@@ -114,7 +113,6 @@
if [ $? -ne 0 ]; then
echo "/usr/bin/gtk-update-icon-cache exited with an error while \
generating the icon cache for $DIR."
- exit $SMF_EXIT_ERR_FATAL
else
echo "Icon cache successfully generated in $DIR"
fi
--
Erwann Ch?ned?,
Desktop Group, Sun Microsystems, Grenoble
Phone : +33 476 188 358 ext: 38358
