Merge lp:~jameinel/bzr-explorer/bug396636 into lp:~bzr-explorer-dev/bzr-explorer/trunk.old

[John A Meinel]

[John A Meinel (jameinel)]

This changes the "run_bzr_gui" command to change scripts indicating they should run "bzr foo" into running either:
python path/to/this/bzr foo

or
path/to/this/bzr foo

I've tested that it works correctly when running from source. I haven't tested if it is correct when running from a compiled executable, but I'm pretty sure that I'm using 'sys.frozen' correctly for that case.

I at least looked here:
http://www.velocityreviews.com/forums/showpost.php?p=1767114&postcount=7

[Ian Clatworthy (ian-clatworthy)]

review: Approve

=== modified file 'lib/explorer.py'
--- lib/explorer.py	2009-07-01 05:36:57 +0000
+++ lib/explorer.py	2009-07-07 16:43:56 +0000
@@ -782,6 +782,13 @@
         # in a dialog if required. Should we use the Qt subprocess stuff here?
         subprocess.Popen(args)
 
+    def _get_bzr_executable(self):
+        if getattr(sys, 'frozen', None) is not None:
+            # Being run from a compiled executable
+            return sys.argv[0]
+        # This should be 'python path/to/bzr'
+        return [sys.executable, sys.argv[0]]
+
     def run_bzr_gui(self, cmd_id, context=None):
         """Run a bzr GUI application externally.
 
@@ -790,6 +797,10 @@
         """
         args = self.get_command_from_app_suite(cmd_id, context)
         if args:
+            if args[0] == 'bzr':
+                # The config says to run a bzr command, so lets run the one
+                # that started this process
+                args[:1] = self._get_bzr_executable()
             self.run_app(args)
         else:
             msg = u"Action not yet supported by current app_suite."