[Python-apps-commits] r2362 - in packages/wicd/trunk/debian (changelog postrm)

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

    Date: Thursday, February 12, 2009 @ 21:54:49
  Author: hanska-guest
Revision: 2362

* debian/postrm:
  - only force-reload DBus if it's already started (Closes: #514778)

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

Modified: packages/wicd/trunk/debian/changelog
===================================================================
--- packages/wicd/trunk/debian/changelog	2009-02-11 13:12:50 UTC (rev 2361)
+++ packages/wicd/trunk/debian/changelog	2009-02-12 21:54:49 UTC (rev 2362)
@@ -9,8 +9,10 @@
     - add information on how to reload DBus
   * debian/control:
     - switched Maintainer/Uploaders fields
+  * debian/postrm:
+    - only force-reload DBus if it's already started (Closes: #514778)
 
- -- David Paleino <d.paleino at gmail.com>  Mon, 09 Feb 2009 13:44:23 +0100
+ -- David Paleino <d.paleino at gmail.com>  Thu, 12 Feb 2009 22:52:24 +0100
 
 wicd (1.5.9-1) unstable; urgency=low
 

Modified: packages/wicd/trunk/debian/postrm
===================================================================
--- packages/wicd/trunk/debian/postrm	2009-02-11 13:12:50 UTC (rev 2361)
+++ packages/wicd/trunk/debian/postrm	2009-02-12 21:54:49 UTC (rev 2362)
@@ -26,10 +26,15 @@
         rm -rf /var/lib/wicd
         rm -rf /var/log/wicd
         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 .
+            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
     ;;