desktopcouch

Merge lp:~thisfred/desktopcouch/fix-linux-detection into lp:desktopcouch

  1. fix-linux-detection
  2. Merge into trunk
Proposed by Eric Casteleijn
Status: Merged
Approved by: dobey
Approved revision: 278
Merged at revision: 277
Proposed branch: lp:~thisfred/desktopcouch/fix-linux-detection
Merge into: lp:desktopcouch
Diff against target: 12 lines (+1/-1)
1 file modified
desktopcouch/application/platform/linux/tests/test_keyring.py (+1/-1)
To merge this branch: bzr merge lp:~thisfred/desktopcouch/fix-linux-detection
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+66191@code.launchpad.net

Commit message

* Fixes linux detection (LP: #803062)

Description of the change

* Fixes linux detection (LP: #803062)

To post a comment you must log in.
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
1=== modified file 'desktopcouch/application/platform/linux/tests/test_keyring.py'
2--- desktopcouch/application/platform/linux/tests/test_keyring.py 2011-01-04 20:29:38 +0000
3+++ desktopcouch/application/platform/linux/tests/test_keyring.py 2011-06-28 17:35:56 +0000
4@@ -30,7 +30,7 @@
5 try:
6 import gnomekeyring
7 except ImportError, e:
8- if sys.platform != 'linux2':
9+ if not sys.platform.startswith('linux'):
10 gnomekeyring = None
11 else:
12 raise e

Subscribers

People subscribed via source and target branches