[Python-apps-commits] r2494 - in packages/wicd/trunk/debian (changelog postinst)

[hanska-guest at users.alioth.debian.org]

    Date: Friday, February 27, 2009 @ 19:55:21
  Author: hanska-guest
Revision: 2494

* The brown-paper-bag bug release
* debian/postinst:
  - only force-reload DBus if it's already started (Closes: #517395),
    I had already fixed this in debian/postrm (see -2).

Modified:
  packages/wicd/trunk/debian/changelog
  packages/wicd/trunk/debian/postinst

Modified: packages/wicd/trunk/debian/changelog
===================================================================
--- packages/wicd/trunk/debian/changelog	2009-02-26 21:42:23 UTC (rev 2493)
+++ packages/wicd/trunk/debian/changelog	2009-02-27 19:55:21 UTC (rev 2494)
@@ -1,3 +1,12 @@
+wicd (1.5.9-3) UNRELEASED; urgency=low
+
+  * The brown-paper-bag bug release
+  * debian/postinst:
+    - only force-reload DBus if it's already started (Closes: #517395),
+      I had already fixed this in debian/postrm (see -2).
+
+ -- David Paleino <d.paleino at gmail.com>  Fri, 27 Feb 2009 20:52:04 +0100
+
 wicd (1.5.9-2) unstable; urgency=low
 
   * debian/patches/:

Modified: packages/wicd/trunk/debian/postinst
===================================================================
--- packages/wicd/trunk/debian/postinst	2009-02-26 21:42:23 UTC (rev 2493)
+++ packages/wicd/trunk/debian/postinst	2009-02-27 19:55:21 UTC (rev 2494)
@@ -24,10 +24,15 @@
     		addgroup --quiet --system netdev
     	fi
         if [ -x "/etc/init.d/dbus" ]; then
-            if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                invoke-rc.d dbus force-reload || exit $?
-            else
-                /etc/init.d/dbus force-reload || exit $?
+            # Check if DBus has started, otherwise this fails on
+            # certain environments (chroots, for example). See
+            # #514778 #517395
+            if [ -n "$DBUS_SESSION_BUS_ADDRESS" ]; then
+                if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+                    invoke-rc.d dbus force-reload || exit $?
+                else
+                    /etc/init.d/dbus force-reload || exit $?
+                fi
             fi
         fi
     ;;