Mercurial Repositories > eric / changeset

--- a/Debugger/DebugUI.py	Sun Dec 19 19:53:48 2010 +0100
+++ b/Debugger/DebugUI.py	Wed Dec 22 17:32:24 2010 +0100
@@ -1416,7 +1416,7 @@
             
             if not doNotStart:
                 if runProject and self.project.getProjectType() == "E4Plugin":
-                    argv = "--plugin=%s %s" % (fn, argv)
+                    argv = '--plugin="%s" %s' % (fn, argv)
                     fn = os.path.join(getConfig('ericDir'), "eric5.py")
                 
                 # Ask the client to open the new program.
@@ -1520,7 +1520,7 @@
             
             if not doNotStart:
                 if runProject and self.project.getProjectType() == "E4Plugin":
-                    argv = "--plugin=%s %s" % (fn, argv)
+                    argv = '--plugin="%s" %s' % (fn, argv)
                     fn = os.path.join(getConfig('ericDir'), "eric5.py")
                 
                 # Ask the client to open the new program.
@@ -1627,7 +1627,7 @@
             
             if not doNotStart:
                 if runProject and self.project.getProjectType() == "E4Plugin":
-                    argv = "--plugin=%s %s" % (fn, argv)
+                    argv = '--plugin="%s" %s' % (fn, argv)
                     fn = os.path.join(getConfig('ericDir'), "eric5.py")
                 
                 # Ask the client to open the new program.
@@ -1742,7 +1742,7 @@
             
             if not doNotStart:
                 if debugProject and self.project.getProjectType() == "E4Plugin":
-                    argv = "--plugin=%s %s" % (fn, argv)
+                    argv = '--plugin="%s" %s' % (fn, argv)
                     fn = os.path.join(getConfig('ericDir'), "eric5.py")
                     tracePython = True # override flag because it must be true
                 
@@ -1793,7 +1793,7 @@
         
         if not doNotStart:
             if forProject and self.project.getProjectType() == "E4Plugin":
-                argv = "--plugin=%s %s" % (fn, argv)
+                argv = '--plugin="%s" %s' % (fn, argv)
                 fn = os.path.join(getConfig('ericDir'), "eric5.py")
             
             if self.lastStartAction in [1, 2]:

--- a/UI/UserInterface.py	Sun Dec 19 19:53:48 2010 +0100
+++ b/UI/UserInterface.py	Wed Dec 22 17:32:24 2010 +0100
@@ -5609,7 +5609,10 @@
         """
         if Version.startswith("@@"):
             # development version, always newer
-            return True
+            if required.endswith(".99"):
+                return False
+            else:
+                return True
         
         if "-snapshot-" in Version:
             # check snapshot version

--- a/Utilities/__init__.py	Sun Dec 19 19:53:48 2010 +0100
+++ b/Utilities/__init__.py	Wed Dec 22 17:32:24 2010 +0100
@@ -712,7 +712,7 @@
     @param s option string (string or string)
     @return list of options (list of strings)
     """
-    rx = QRegExp(r"""\s([^\s]+|"[^"]+"|'[^']+')""")
+    rx = QRegExp(r"""\s([\w=/-]*"[^"]+"|[\w=/-]*'[^']+'|[^\s]+)""")
     s = re.sub(r"%[A-Z%]", _percentReplacementFunc, s)
     return parseString(s, rx)
     

--- a/eric5.py	Sun Dec 19 19:53:48 2010 +0100
+++ b/eric5.py	Wed Dec 22 17:32:24 2010 +0100
@@ -212,7 +212,7 @@
     for arg in sys.argv:
         if arg.startswith("--plugin=") and sys.argv.index(arg) < ddindex:
             # extract the plugin development option
-            pluginFile = arg.replace("--plugin=", "")
+            pluginFile = arg.replace("--plugin=", "").replace('"', "")
             sys.argv.remove(arg)
             pluginFile = os.path.expanduser(pluginFile)
             pluginFile = Utilities.normabspath(pluginFile)