r31508 - in /desktop/experimental/glib2.0/debian: changelog libglib2.0-0.postinst.in

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Nov 18 12:06:25 2011
New Revision: 31508

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31508
Log:
Avoid harmless warning when running
"/usr/lib/i386-linux-gnu/glib-2.0/gio-querymodules
/usr/lib/i386-linux-gnu/gio/modules /usr/lib/gio/modules" on an amd64
system without /usr/lib/i386-linux-gnu/gio/modules: "Unable to open
directory /usr/lib/i386-linux-gnu/gio/modules: Error opening directory
'/usr/lib/i386-linux-gnu/gio/modules': No such file or directory"

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

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=31508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Nov 18 12:06:25 2011
@@ -1,3 +1,14 @@
+glib2.0 (2.30.2-4) UNRELEASED; urgency=low
+
+  * Avoid harmless warning when running
+    "/usr/lib/i386-linux-gnu/glib-2.0/gio-querymodules
+    /usr/lib/i386-linux-gnu/gio/modules /usr/lib/gio/modules" on an amd64
+    system without /usr/lib/i386-linux-gnu/gio/modules: "Unable to open
+    directory /usr/lib/i386-linux-gnu/gio/modules: Error opening directory
+    '/usr/lib/i386-linux-gnu/gio/modules': No such file or directory"
+
+ -- Loïc Minier <lool at debian.org>  Fri, 18 Nov 2011 13:04:50 +0100
+
 glib2.0 (2.30.2-3) experimental; urgency=low
 
   * debian/patches/98-disable-two-more-GDBus-tests-using-fork.patch:

Modified: desktop/experimental/glib2.0/debian/libglib2.0-0.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.postinst.in?rev=31508&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0.postinst.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.postinst.in [utf-8] Fri Nov 18 12:06:25 2011
@@ -17,7 +17,17 @@
             # This is triggered everytime an application installs a GIO
             # module into /usr/lib/#MULTIARCH#/gio/modules or the
             # backwards-compatible /usr/lib/gio/modules directory
-            /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/#MULTIARCH#/gio/modules /usr/lib/gio/modules
+
+            # check which directories actually exist
+            dirs=""
+            for dir in /usr/lib/#MULTIARCH#/gio/modules /usr/lib/gio/modules; do
+                if [ -d "$dir" ]; then
+                    dirs="$dirs $dir"
+                fi
+            done
+            if [ -n "$dirs" ]; then
+                /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules $dirs
+            fi
             ;;
         esac
     done