r32613 - in /desktop/unstable/glib2.0/debian: changelog libglib2.0-0.postinst.in

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Feb 16 11:27:40 2012
New Revision: 32613

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32613
Log:
* libglib2.0-0.posinst.in:
  + Encapsulate gio-querymodules calls in || true statements.
    Closes: #659588.
  + Only run gio-querymodules on the non-multiarch path and 
    glib-compile-schemas for the host architecture.

Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/libglib2.0-0.postinst.in

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=32613&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Thu Feb 16 11:27:40 2012
@@ -1,3 +1,13 @@
+glib2.0 (2.30.2-7) UNRELEASED; urgency=low
+
+  * libglib2.0-0.posinst.in:
+    + Encapsulate gio-querymodules calls in || true statements.
+      Closes: #659588.
+    + Only run gio-querymodules on the non-multiarch path and 
+      glib-compile-schemas for the host architecture.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 16 Feb 2012 12:21:51 +0100
+
 glib2.0 (2.30.2-6) unstable; urgency=low
 
   * Revert the patches added in 2.30.2-5 which changed the handling of return

Modified: desktop/unstable/glib2.0/debian/libglib2.0-0.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-0.postinst.in?rev=32613&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.postinst.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0.postinst.in [utf-8] Thu Feb 16 11:27:40 2012
@@ -10,7 +10,10 @@
           /usr/share/glib-2.0/schemas)
             # This is triggered everytime an application installs a
             # GSettings schema
-            /usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
+            # Only do this once, using the host installation.
+            if [ $(dpkg-architecture -qDEB_HOST_MULTIARCH) = #MULTIARCH# ]; then
+              /usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
+            fi
             ;;
 
           /usr/lib/#MULTIARCH#/gio/modules|/usr/lib/gio/modules)
@@ -22,10 +25,10 @@
             # libglib2.0 itself so we need to check to avoid a warning from
             # gio-querymodules
             dirs=/usr/lib/#MULTIARCH#/gio/modules
-            if [ -d /usr/lib/gio/modules ]; then
+            if [ -d /usr/lib/gio/modules ] && [ $(dpkg-architecture -qDEB_HOST_MULTIARCH) = #MULTIARCH# ]; then
                 dirs="$dirs /usr/lib/gio/modules"
             fi
-            /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules $dirs
+            /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules $dirs || true
             ;;
         esac
     done
@@ -35,12 +38,12 @@
 #DEBHELPER#
 
 # Also handle the initial installation
-if [ -d /usr/share/glib-2.0/schemas ]; then
+if [ -d /usr/share/glib-2.0/schemas ] && [ $(dpkg-architecture -qDEB_HOST_MULTIARCH) = #MULTIARCH# ]; then
     /usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
 fi
 if [ -d /usr/lib/#MULTIARCH#/gio/modules ]; then
-    /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/#MULTIARCH#/gio/modules
+    /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/#MULTIARCH#/gio/modules || true
 fi
-if [ -d /usr/lib/gio/modules ]; then
-    /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/gio/modules
+if [ -d /usr/lib/gio/modules ] && [ $(dpkg-architecture -qDEB_HOST_MULTIARCH) = #MULTIARCH# ]; then
+    /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/gio/modules || true
 fi