desktopcouch

Merge lp:~mandel/desktopcouch/fix_pairing into lp:desktopcouch

  1. fix_pairing
  2. Merge into trunk
Proposed by Manuel de la Peña
Status: Merged
Approved by: Chad Miller
Approved revision: 172
Merged at revision: 172
Proposed branch: lp:~mandel/desktopcouch/fix_pairing
Merge into: lp:desktopcouch
Diff against target: 25 lines (+2/-2)
2 files modified
bin/desktopcouch-service (+1/-1)
desktopcouch/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~mandel/desktopcouch/fix_pairing
Reviewer Review Type Date Requested Status
Chad Miller (community) Approve
Eric Casteleijn (community) Approve
Natalia Bidart (community) Approve
Review via email: mp+35067@code.launchpad.net

Commit message

Fixes #634396 and #634784. Invalid parameters corrected in using string format and in defining a function.

Description of the change

Fixes #634396 and #634784.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve
Revision history for this message
Eric Casteleijn (thisfred) wrote :

Looks great. I assume the _got_newcredentials function is never called by anything in the tests then. If there is a way to change that that doesn't take a lot of work, that would be awesome.

review: Approve
Revision history for this message
Manuel de la Peña (mandel) wrote :

> Looks great. I assume the _got_newcredentials function is never called by
> anything in the tests then. If there is a way to change that that doesn't take
> a lot of work, that would be awesome.

Yes, that was the issue, I really did not find an easy way to test it other than starting the desktopcouch service, then the ubuntu_sso one, and get the credentials... kind of a lot of work :(

Revision history for this message
Chad Miller (cmiller) wrote :

Yes, looks good. I think the "+" inside the parenthesis is unnecessary, but it's not worth changing.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/desktopcouch-service'
2--- bin/desktopcouch-service 2010-09-09 13:35:18 +0000
3+++ bin/desktopcouch-service 2010-09-10 10:01:11 +0000
4@@ -79,7 +79,7 @@
5 "Exported method to quit the program"
6 self.death()
7
8-def _got_newcredentials(self, app_name, credentials):
9+def _got_newcredentials(app_name, credentials):
10 """Add the pairing with ubuntu one when a new crendential has been detected."""
11 if app_name == 'Ubuntu One':
12 logging.debug("Got new credentials for Ubuntu One.")
13
14=== modified file 'desktopcouch/__init__.py'
15--- desktopcouch/__init__.py 2010-09-09 13:53:04 +0000
16+++ desktopcouch/__init__.py 2010-09-10 10:01:11 +0000
17@@ -147,7 +147,7 @@
18 fd_paths.append(os.readlink(dirent_path))
19 except OSError:
20 logging.debug("dirent %r disappeared before " +
21- "we could read it. " % (dirent_path,))
22+ "we could read it. ", dirent_path)
23 continue
24 except OSError:
25 if retries_left:

Subscribers

People subscribed via source and target branches