Merge lp:~cmiller/desktopcouch/call_blocking_dbus_exception into lp:desktopcouch

Proposed by Chad Miller on 2010-05-05
Status: Merged
Approved by: Rodrigo Moya on 2010-05-06
Approved revision: 155
Merged at revision: 159
Proposed branch: lp:~cmiller/desktopcouch/call_blocking_dbus_exception
Merge into: lp:desktopcouch
Diff against target: 19 lines (+6/-3)
1 file modified
desktopcouch/pair/couchdb_pairing/dbus_io.py (+6/-3)
To merge this branch: bzr merge lp:~cmiller/desktopcouch/call_blocking_dbus_exception
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve on 2010-05-06
Stuart Colville (community) 2010-05-05 Approve on 2010-05-06
Review via email: mp+24768@code.launchpad.net

Commit message

Don't crash when we're trying to stop announcing on DBus and the DBus server won't talk to us. It's not a big error, since it probably won't talk to anyone else either. (LP: #563738, #464071)

To post a comment you must log in.
Stuart Colville (muffinresearch) wrote :

Looks good.

review: Approve
Rodrigo Moya (rodrigo-moya) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'desktopcouch/pair/couchdb_pairing/dbus_io.py'
2--- desktopcouch/pair/couchdb_pairing/dbus_io.py 2010-04-05 21:17:42 +0000
3+++ desktopcouch/pair/couchdb_pairing/dbus_io.py 2010-05-05 19:04:26 +0000
4@@ -89,9 +89,12 @@
5
6 def unpublish(self):
7 """End the advertisement."""
8- self.group.Reset()
9- self.logging.info("ending advertising %s on port %d",
10- self.stype, self.port)
11+ try:
12+ self.logging.info("ending advertising %s on port %d",
13+ self.stype, self.port)
14+ self.group.Reset()
15+ except DBusError, e:
16+ self.logging.warn("Couldn't reset DBus at shutdown. %s" % (e,))
17 self.group = None
18
19 def die(self):

Subscribers

People subscribed via source and target branches