r29173 - in /desktop/unstable/gdk-pixbuf/debian: changelog libgdk-pixbuf2.0-0.postinst.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jul 28 16:18:01 2011
New Revision: 29173

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29173
Log:
* debian/libgdk-pixbuf2.0-0.postinst.in:
  - Don't hide error messages from gdk-pixbuf-query-loaders.
  - Handle more gracefully the case where the non-multiarch loaders
    directory is empty or doesn't exist.

Modified:
    desktop/unstable/gdk-pixbuf/debian/changelog
    desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst.in

Modified: desktop/unstable/gdk-pixbuf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/changelog?rev=29173&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/changelog [utf-8] Thu Jul 28 16:18:01 2011
@@ -2,8 +2,12 @@
 
   * debian/rules:
     - Trap errors in for loop using 'set -e'.
+  * debian/libgdk-pixbuf2.0-0.postinst.in:
+    - Don't hide error messages from gdk-pixbuf-query-loaders.
+    - Handle more gracefully the case where the non-multiarch loaders
+      directory is empty or doesn't exist.
 
- -- Michael Biebl <biebl at debian.org>  Sat, 16 Jul 2011 01:39:22 +0200
+ -- Michael Biebl <biebl at debian.org>  Thu, 28 Jul 2011 18:12:11 +0200
 
 gdk-pixbuf (2.23.5-2) unstable; urgency=low
 

Modified: desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst.in?rev=29173&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst.in [utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/libgdk-pixbuf2.0-0.postinst.in [utf-8] Thu Jul 28 16:18:01 2011
@@ -1,5 +1,8 @@
 #!/bin/sh
 set -e
+
+LOADERS_DIR=/usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders
+LOADERS_DIR_OLD=/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders
 
 if [ "$1" = triggered ]; then
     for trigger in $2; do
@@ -7,14 +10,12 @@
             continue
         fi
         case $trigger in
-          /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders|/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders)
+          $LOADERS_DIR|$LOADERS_DIR_OLD)
             # This is triggered everytime an application installs a
             # GdkPixbuf loader
             /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
-                /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders/*.so \
-                /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so \
-            > /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders.cache 2>/dev/null \
-            || true
+                $(find $LOADERS_DIR $LOADERS_DIR_OLD -name *.so 2> /dev/null) \
+            > /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders.cache || true
             ;;
         esac
     done
@@ -25,12 +26,8 @@
 #DEBHELPER#
 
 # Also handle the initial installation
-if [ -d /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders ] \
-   || [ -d /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders ]
-then
+if [ -d $LOADERS_DIR ] || [ -d $LOADERS_DIR_OLD ]; then
     /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
-        /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders/*.so \
-        /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so \
-    > /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders.cache 2>/dev/null \
-    || true
+        $(find $LOADERS_DIR $LOADERS_DIR_OLD -name *.so 2> /dev/null) \
+    > /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/2.10.0/loaders.cache || true
 fi