Ubuntu One Client

Merge lp:~brian.curtin/ubuntuone-client/take-first-element into lp:ubuntuone-client

  1. take-first-element
  2. Merge into trunk
Proposed by Brian Curtin on 2012-10-15
Status: Merged
Approved by: Brian Curtin on 2012-10-16
Approved revision: 1344
Merged at revision: 1345
Proposed branch: lp:~brian.curtin/ubuntuone-client/take-first-element
Merge into: lp:ubuntuone-client
Diff against target: 11 lines (+1/-1)
1 file modified
ubuntuone/syncdaemon/utils.py (+1/-1)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-client/take-first-element
Reviewer Review Type Date Requested Status
Mike McCracken (community) 2012-10-15 Approve on 2012-10-16
Review via email: mp+129779@code.launchpad.net

Commit Message

- Take first element of procutils.which as proper python executable.

Description of the Change

We should really be inserting only the first element returned by procutils.which, not the whole list.

To post a comment you must log in.
Mike McCracken (mikemc) wrote :

Works for me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/syncdaemon/utils.py'
2--- ubuntuone/syncdaemon/utils.py 2012-10-12 20:05:30 +0000
3+++ ubuntuone/syncdaemon/utils.py 2012-10-15 22:26:20 +0000
4@@ -55,6 +55,6 @@
5 if sys.platform in ('darwin'):
6 cmd_args.insert(0, 'python')
7 elif sys.platform in ('win32'):
8- cmd_args.insert(0, procutils.which("python.exe"))
9+ cmd_args.insert(0, procutils.which("python.exe")[0])
10
11 return cmd_args

Subscribers

People subscribed via source and target branches