[Pkg-bazaar-commits] ./bzr-gtk/unstable r240: Merge fix for local commits when network manager isn't available.
Jelmer Vernooij
jelmer at samba.org
Fri Apr 10 07:49:15 UTC 2009
------------------------------------------------------------
revno: 240
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2007-07-19 15:16:31 +0200
message:
Merge fix for local commits when network manager isn't available.
modified:
commit.py
------------------------------------------------------------
revno: 235.1.1
committer: Mateusz Korniak <matkor at laptop-hp>
branch nick: gtk
timestamp: Thu 2007-07-19 14:57:26 +0200
message:
Fix for broken dbus detection if network is avaiable.
modified:
commit.py
-------------- next part --------------
=== modified file 'commit.py'
--- a/commit.py 2007-03-21 00:24:51 +0000
+++ b/commit.py 2007-07-19 13:16:31 +0000
@@ -153,9 +153,14 @@
'/org/freedesktop/NetworkManager')
dbus_iface = dbus.Interface(
proxy_obj, 'org.freedesktop.NetworkManager')
- # 3 is the enum value for STATE_CONNECTED
- self._check_local.set_active(dbus_iface.state() != 3)
-
+ try:
+ # 3 is the enum value for STATE_CONNECTED
+ self._check_local.set_active(dbus_iface.state() != 3)
+ except dbus.DBusException, e:
+ # Silently drop errors. While DBus may be
+ # available, NetworkManager doesn't necessarily have to be
+ mutter("unable to get networkmanager state: %r" % e)
+
# Create the file list
self._create_file_view()
# Create the pending merges
More information about the Pkg-bazaar-commits
mailing list