desktopcouch

Merge lp://qastaging/~sil/desktopcouch/oauthdata-not-none into lp://qastaging/desktopcouch

  1. oauthdata-not-none
  2. Merge into trunk
Proposed by Stuart Langridge
Status: Merged
Approved by: dobey
Approved revision: 66
Merged at revision: not available
Proposed branch: lp://qastaging/~sil/desktopcouch/oauthdata-not-none
Merge into: lp://qastaging/desktopcouch
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~sil/desktopcouch/oauthdata-not-none
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+11956@code.qastaging.launchpad.net

Commit message

Make desktopcouch-pair not throw an error about oauth_data() not being callable on startup

To post a comment you must log in.
Revision history for this message
Stuart Langridge (sil) wrote :

Code calls wrong oauth_data (should call get_oauth_data). Not sure why this wasn't caught in testing.

Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'desktopcouch/replication_services/ubuntuone.py'
--- desktopcouch/replication_services/ubuntuone.py 2009-09-14 16:54:22 +0000
+++ desktopcouch/replication_services/ubuntuone.py 2009-09-17 09:58:35 +0000
@@ -10,7 +10,7 @@
1010
11def is_active():11def is_active():
12 """Can we deliver information?"""12 """Can we deliver information?"""
13 return oauth_data() is not None13 return get_oauth_data() is not None
1414
15oauth_data = None15oauth_data = None
16def get_oauth_data():16def get_oauth_data():

Subscribers

People subscribed via source and target branches