Ubuntu One Control Panel

Merge lp:~thisfred/ubuntuone-control-panel/fix-linux-detection into lp:ubuntuone-control-panel

  1. fix-linux-detection
  2. Merge into trunk
Proposed by Eric Casteleijn
Status: Merged
Approved by: dobey
Approved revision: 172
Merged at revision: 171
Proposed branch: lp:~thisfred/ubuntuone-control-panel/fix-linux-detection
Merge into: lp:ubuntuone-control-panel
Diff against target: 10 lines (+1/-1)
1 file modified
ubuntuone/controlpanel/sd_client/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~thisfred/ubuntuone-control-panel/fix-linux-detection
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+66190@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
=== modified file 'ubuntuone/controlpanel/sd_client/__init__.py'
--- ubuntuone/controlpanel/sd_client/__init__.py 2011-05-18 19:12:57 +0000
+++ ubuntuone/controlpanel/sd_client/__init__.py 2011-06-28 17:32:30 +0000
@@ -23,5 +23,5 @@
23# pylint: disable=W0401, W061423# pylint: disable=W0401, W0614
2424
2525
26if sys.platform == "linux2":26if sys.platform.startswith("linux"):
27 from ubuntuone.controlpanel.sd_client.linux import *27 from ubuntuone.controlpanel.sd_client.linux import *

Subscribers

People subscribed via source and target branches