r31904 - in /desktop/unstable/gtk+3.0/debian: changelog libgtk-3-0.postinst.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Nov 29 22:12:42 2011
New Revision: 31904

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31904
Log:
debian/libgtk-3-0.postinst.in: If the non-multiarch immodules directory
does not exist or is empty handle this case more gracefully and don't
print an error message.

Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/libgtk-3-0.postinst.in

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=31904&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Tue Nov 29 22:12:42 2011
@@ -43,7 +43,12 @@
   * Remove incorrect M-A: same statement for the debug package.
   * Make libgtk-3-bin arch-any, thanks Rico for noticing.
 
- -- Martin Pitt <mpitt at debian.org>  Tue, 22 Nov 2011 09:34:45 +0100
+  [ Michael Biebl ]
+  * debian/libgtk-3-0.postinst.in: If the non-multiarch immodules directory
+    does not exist or is empty handle this case more gracefully and don't
+    print an error message.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 29 Nov 2011 21:39:20 +0100
 
 gtk+3.0 (3.2.2-2) unstable; urgency=low
 

Modified: desktop/unstable/gtk+3.0/debian/libgtk-3-0.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/libgtk-3-0.postinst.in?rev=31904&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/libgtk-3-0.postinst.in [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/libgtk-3-0.postinst.in [utf-8] Tue Nov 29 22:12:42 2011
@@ -1,5 +1,8 @@
 #!/bin/sh
 set -e
+
+IMMODULES_DIR=/@MODULES_BASE_PATH@/immodules
+IMMODULES_DIR_OLD=/@OLD_MODULES_BASE_PATH@/immodules
 
 if [ "$1" = triggered ]; then
     for trigger in $2; do
@@ -7,10 +10,12 @@
             continue
         fi
         case $trigger in
-          /@MODULES_BASE_PATH@/immodules|/@OLD_MODULES_BASE_PATH@/immodules)
+          $IMMODULES_DIR|$IMMODULES_DIR_OLD)
             # This is triggered everytime an application installs a
             # GTK immodule loader
-            /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so /@OLD_MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/immodules.cache || true
+            /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 \
+                $(find $IMMODULES_DIR $IMMODULES_DIR_OLD -name *.so 2> /dev/null) \
+            > /@MODULES_BASE_PATH@/gtk.immodules || true
             ;;
         esac
     done
@@ -20,7 +25,9 @@
 #DEBHELPER#
 
 # Also handle the initial installation
-if [ -d /@MODULES_BASE_PATH@/immodules ]; then
-     /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so /@OLD_MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/immodules.cache || true
+if [ -d $IMMODULES_DIR ] || [ -d $IMMODULES_DIR_OLD ]; then
+     /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 \
+         $(find $IMMODULES_DIR $IMMODULES_DIR_OLD -name *.so 2> /dev/null) \
+     > /@MODULES_BASE_PATH@/gtk.immodules || true
 fi