Merge lp:~brian.curtin/ubuntuone-client/upoad-spellcheck into lp:ubuntuone-client

[Brian Curtin]

Correct spelling of "upload" (from "upoad") in a keyword argument.

Spelling change on keyword argument: upoad to upLoad

FWIW, nothing seems affected by this change when running the tests. I just noticed the spelling error and fixed it since it's actually in usable code.

[dobey (dobey)]

review: Approve

[Natalia Bidart (nataliabidart)]

Brian,

can you please add a test that will fail with this typo?

Thanks a lot!

review: Needs Fixing

[lp:~brian.curtin/ubuntuone-client/upoad-spellcheck]

1209. By Brian Curtin on 2012-03-16

Give reactor.spawnProcess a process_path and args that will work on win32

1210. By Brian Curtin on 2012-03-16

Put TUNNEL_EXECUTABLE back in so Linux doesn't break

Unmerged revisions

1210. By Brian Curtin on 2012-03-16

Put TUNNEL_EXECUTABLE back in so Linux doesn't break

=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2012-03-01 19:08:12 +0000
+++ ubuntuone/syncdaemon/interaction_interfaces.py	2012-03-19 14:00:46 +0000
@@ -841,7 +841,7 @@
         """Handle AQ_UPLOAD_ERROR."""
         self._path_from_ids(share_id, node_id, 'UploadFinished',
                             info=dict(error=str(error)),
-                            error_info=dict(upoad_error=str(error)))
+                            error_info=dict(upload_error=str(error)))
 
     @log_call(logger.debug)
     def handle_SV_ACCOUNT_CHANGED(self, account_info):

=== modified file 'ubuntuone/syncdaemon/tunnel_runner.py'
--- ubuntuone/syncdaemon/tunnel_runner.py	2012-03-12 17:42:57 +0000
+++ ubuntuone/syncdaemon/tunnel_runner.py	2012-03-19 14:00:46 +0000
@@ -16,6 +16,7 @@
 """Run the tunnel process and start a client, with a reactor as a fallback."""
 
 import logging
+import sys
 
 from os import path
 
@@ -43,7 +44,20 @@
         from ubuntuone.proxy.tunnel_client import TunnelProcessProtocol
         protocol = TunnelProcessProtocol(self.client_d)
         process_path = self.get_process_path()
-        args = [TUNNEL_EXECUTABLE, host, str(port)]
+        args = [host, str(port)]
+
+        if sys.platform == "win32" and not hasattr(sys, "frozen"):
+            # On Windows we can't start TUNNEL_EXECUTABLE directly.
+            # Start a Python interpreter with TUNNEL_EXECUTABLE inserted
+            # as the first argument, with its arguments following.
+            args = [process_path,] + args
+            process_path = sys.executable
+        elif hasattr(sys, "frozen"):
+            # Frozen, in a Windows build start the executable.
+            process_path = os.path.join(sys.prefix, TUNNEL_EXECUTABLE+".exe")
+        else:
+            args = [TUNNEL_EXECUTABLE,] + args
+
         reactor.spawnProcess(protocol, process_path, env=None, args=args)
 
     def get_process_path(self):