r14625 - in /desktop/unstable/gtk+2.0/debian: changelog update-icon-caches

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Feb 17 12:38:13 2008
New Revision: 14625

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14625
Log:
* update-icon-caches: always exit with a 0 code to avoid breaking 
  upgrades when a cache is corrupt. Display a big fat warning instead.
  Closes: #466083.

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/update-icon-caches

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=14625&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Sun Feb 17 12:38:13 2008
@@ -1,3 +1,11 @@
+gtk+2.0 (2.12.8-2) UNRELEASED; urgency=low
+
+  * update-icon-caches: always exit with a 0 code to avoid breaking 
+    upgrades when a cache is corrupt. Display a big fat warning instead.
+    Closes: #466083.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 17 Feb 2008 13:38:47 +0100
+
 gtk+2.0 (2.12.8-1) unstable; urgency=low
 
   * New upstream bugfix release:

Modified: desktop/unstable/gtk+2.0/debian/update-icon-caches
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/update-icon-caches?rev=14625&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/update-icon-caches (original)
+++ desktop/unstable/gtk+2.0/debian/update-icon-caches Sun Feb 17 12:38:13 2008
@@ -1,6 +1,4 @@
 #!/bin/sh
-
-set -e
 
 case "$1" in
     ""|-h|--help)
@@ -16,7 +14,9 @@
     if [ -f "$dir"/index.theme ]; then
         if [ -f "$dir"/icon-theme.cache ]; then
             # The cache already exists, regenerate it
-            gtk-update-icon-cache --force --quiet "$dir"
+            if ! gtk-update-icon-cache --force --quiet "$dir"; then
+                echo "WARNING: icon cache generation failed for $dir"
+            fi
         fi
     else
         # No more index.theme, remove the cache if it exists
@@ -25,3 +25,4 @@
     fi
 done
 
+exit 0