Ticket #273: wcw - only start in winswitch option.patch

winswitch/net/command_wrapper.py

@@ -8 +8 @@
 import os
 
 VERBOSE_FLAG = "--winswitch-verbose"
+WINSWITCH_ONLY_FLAG = "--winswitch-only"
 
 verbose = VERBOSE_FLAG in sys.argv
 if verbose:
         sys.argv.remove(VERBOSE_FLAG)
+winswitch_only = WINSWITCH_ONLY_FLAG in sys.argv
+if winswitch_only:
+        sys.argv.remove(WINSWITCH_ONLY_FLAG)
+
 from winswitch.util.simple_logger import set_log_to_tty
 set_log_to_tty(verbose)
 
@@ -22 +27 @@
         print("  arguments                Optional arguments for the command")
         print("  -h  --help               This information")
         print("  --winswitch-verbose      Turn on verbose logging")
+        print("  --winswitch-only         Do not start commands outside Window Switch")
         print("")
         print("This is a wrapper script for launching commands")
         print("via Window Switch.")
@@ -66 +72 @@
         except Exception, e:
                 print("%s: error sending to client: %s" % (sys.argv[0], e))
                 return  False
+                
 
-
 def execute_command(argv):
         if start_via_client(argv):
                 return  0
+        elif winswitch_only:
+                print("failed to start inside Window Switch")
+                print("Giving up as requested")
+                return 1
+
         #socket failed to send, so start the command directly
         os.execvp(argv[0], argv)