Merge lp:~mikemc/ubuntu-sso-client/fix-1018924-use-buildout-python into lp:ubuntu-sso-client

[Mike McCracken]

- Use buildout python when running from source on darwin and windows. (LP: #1018924)

- Use buildout python when running from source on darwin and windows. (LP: #1018924)

[dobey (dobey)]

I don't think there should be any specific references to ubuntuone-client in ubuntu-sso-client. There are independent. Why would they be needed here exactly?

review: Needs Information

[dobey (dobey)]

review: Disapprove

Unmerged revisions

983. By Mike McCracken on 2012-06-29

Make Windows tcpactivation only use registry for executable search when frozen.

982. By Mike McCracken on 2012-06-29

Tag as fixing (LP: #1018924)

981. By Mike McCracken on 2012-06-29

Use buildout python to run subprocesses during development. (LP: #1018924)

=== modified file 'run-mac-tests'
--- run-mac-tests	2012-05-01 11:56:52 +0000
+++ run-mac-tests	2012-06-29 16:55:21 +0000
@@ -48,7 +48,7 @@
 }
 
 echo "*** Running QT test suite for ""$MODULE"" ***"
-./setup.py build
+python ./setup.py build
 python $u1trial --reactor=qt4 --gui -p "$GTK_TESTS_PATH" -i "test_gui.py, test_linux.py, test_qt.py, test_windows.py, test_glib.py, test_txsecrets.py" "$MODULE"
 rm -rf _trial_temp
 rm -rf build

=== modified file 'ubuntu_sso/main/darwin.py'
--- ubuntu_sso/main/darwin.py	2012-05-21 14:38:23 +0000
+++ ubuntu_sso/main/darwin.py	2012-06-29 16:55:21 +0000
@@ -48,6 +48,8 @@
 logger = setup_logging("ubuntu_sso.main.darwin")
 SSO_INSTALL_PATH = 'SSOInstallPath'
 
+SD_SERVICE_NAME = 'ubuntuone-syncdaemon'
+
 
 def get_sso_domain_socket():
     """Compute the domain socket for the sso ipc."""
@@ -59,15 +61,23 @@
     """Find the path to the executable callback."""
     # TODO: We have to either use launchd to launch the different services
     # on demand or us LaunchServices to handle running the app via an URL.
-    ubuntu_sso_pkg_dir = os.path.dirname(os.path.dirname(ubuntu_sso.__file__))
-    ubuntu_sso_bin_dir = os.path.join(ubuntu_sso_pkg_dir, 'bin')
-    ubuntu_sso_bin = os.path.join(ubuntu_sso_bin_dir, 'ubuntu-sso-login')
-    ubuntuone_client_bin_dir = os.path.join(ubuntu_sso_pkg_dir,
-                                            '../ubuntuone-client/bin')
-    ubuntuone_client_bin = os.path.join(ubuntuone_client_bin_dir, name)
-    if os.path.exists(ubuntuone_client_bin):
-        return ubuntuone_client_bin
-    return ubuntu_sso_bin
+
+    module_filename = ubuntu_sso.__file__
+    ubuntu_sso_pkg_dir = os.path.dirname(os.path.dirname(module_filename))
+
+    if name == SSO_SERVICE_NAME:
+        ubuntu_sso_bin_dir = os.path.join(ubuntu_sso_pkg_dir, 'bin')
+        ubuntu_sso_bin = os.path.join(ubuntu_sso_bin_dir, 'ubuntu-sso-login')
+        return "python " + ubuntu_sso_bin
+
+    elif name == SD_SERVICE_NAME:
+        ubuntuone_client_bin_dir = os.path.join(ubuntu_sso_pkg_dir,
+                                                '../ubuntuone-client/bin')
+        ubuntuone_client_bin = os.path.join(ubuntuone_client_bin_dir, name)
+        return "python " + ubuntuone_client_bin
+
+    else:
+        raise Exception("unknown service name %r" % name)
 
 
 class DescriptionFactory(object):

=== modified file 'ubuntu_sso/main/windows.py'
--- ubuntu_sso/main/windows.py	2012-06-27 20:16:56 +0000
+++ ubuntu_sso/main/windows.py	2012-06-29 16:55:21 +0000
@@ -86,10 +86,20 @@
 
 def get_activation_cmdline(name):
     """Find the path to the executable callback."""
-    key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, U1_REG_PATH)
-    # pylint: disable=W0612
-    value, registry_type = winreg.QueryValueEx(key, "path-" + name)
-    return value
+    if getattr(sys, "frozen", None) is not None:
+        key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, U1_REG_PATH)
+        # pylint: disable=W0612
+        value, registry_type = winreg.QueryValueEx(key, "path-" + name)
+        return value
+
+    else:
+        dirname = os.path.dirname(sys.argv[0])
+        if name == SSO_SERVICE_NAME:
+            exe_name = 'ubuntu-sso-login'
+        else:
+            exe_name = 'ubuntuone-syncdaemon'
+        value = os.path.join(dirname, exe_name)
+        return "python " + value
 
 
 class DescriptionFactory(object):

=== modified file 'ubuntu_sso/utils/tcpactivation.py'
--- ubuntu_sso/utils/tcpactivation.py	2012-06-28 21:55:43 +0000
+++ ubuntu_sso/utils/tcpactivation.py	2012-06-29 16:55:21 +0000
@@ -151,7 +151,9 @@
         # Without using close_fds=True, strange things happen
         # with logging on windows. More information at
         # http://bugs.python.org/issue4749
-        subprocess.Popen(self.config.command_line, close_fds=True)
+        subprocess.Popen(self.config.command_line,
+                         close_fds=True,
+                         shell=True)
 
     @defer.inlineCallbacks
     def _do_get_active_description(self):