Merge lp:~brian.curtin/ubuntuone-client/correct-subprocess-args into lp:ubuntuone-client

[Brian Curtin]

- Use procutils.which to identify the full path of a python executable to be spawned on Windows.

As was done on SSO, insert the full path to the proper python executable before passing the argument string off to be spawned.

[dobey (dobey)]

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'ubuntuone/syncdaemon/utils.py'
--- ubuntuone/syncdaemon/utils.py	2012-07-13 16:06:27 +0000
+++ ubuntuone/syncdaemon/utils.py	2012-10-12 20:11:38 +0000
@@ -31,6 +31,8 @@
 import os
 import sys
 
+from twisted.python import procutils
+
 from dirspec.utils import get_program_path
 
 DARWIN_APP_NAMES = {'ubuntuone-syncdaemon': 'UbuntuOne Syncdaemon.app'}
@@ -49,7 +51,10 @@
 
     # adjust cmd for platforms using buildout-generated python
     # wrappers
-    if (getattr(sys, 'frozen', None) is None
-        and sys.platform in ('win32', 'darwin')):
-        cmd_args.insert(0, 'python')
+    if getattr(sys, 'frozen', None) is None:
+        if sys.platform in ('darwin'):
+            cmd_args.insert(0, 'python')
+        elif sys.platform in ('win32'):
+            cmd_args.insert(0, procutils.which("python.exe"))
+
     return cmd_args