Fixed an issue in Project.py causing the main script name being overwritten whenn adding files to a new project.

Sun, 25 Jul 2010 10:21:34 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 25 Jul 2010 10:21:34 +0200
changeset 401
54b80c7a802b
parent 399
29a375f37444
child 404
44a541bea034

Fixed an issue in Project.py causing the main script name being overwritten whenn adding files to a new project.

Project/Project.py file | annotate | diff | comparison | revisions
--- a/Project/Project.py	Sat Jul 24 18:30:40 2010 +0200
+++ b/Project/Project.py	Sun Jul 25 10:21:34 2010 +0200
@@ -2361,7 +2361,8 @@
                 # check, if the existing project directory is already under
                 # VCS control
                 pluginManager = e5App().getObject("PluginManager")
-                for indicator, vcsData in list(pluginManager.getVcsSystemIndicators().items()):
+                for indicator, vcsData in list(
+                        pluginManager.getVcsSystemIndicators().items()):
                     if os.path.exists(os.path.join(self.ppath, indicator)):
                         if len(vcsData) > 1:
                             vcsList = []
@@ -2541,10 +2542,12 @@
                 if fnmatch.fnmatch(ts, pattern):
                     self.pdata["TRANSLATIONS"].append(ts)
                     self.emit(SIGNAL('projectLanguageAdded'), ts)
-            if self.pdata["PROGLANGUAGE"][0] in ["Python", "Python3"]:
-                self.pdata["MAINSCRIPT"] = ['%s.py' % mainscriptname]
-            elif self.pdata["PROGLANGUAGE"][0] == "Ruby":
-                self.pdata["MAINSCRIPT"] = ['%s.rb' % mainscriptname]
+            if len(self.pdata["MAINSCRIPT"]) == 0 or \
+               len(self.pdata["MAINSCRIPT"][0]) == 0:
+                if self.pdata["PROGLANGUAGE"][0] in ["Python", "Python3"]:
+                    self.pdata["MAINSCRIPT"] = ['%s.py' % mainscriptname]
+                elif self.pdata["PROGLANGUAGE"][0] == "Ruby":
+                    self.pdata["MAINSCRIPT"] = ['%s.rb' % mainscriptname]
             if self.pdata["TRANSLATIONSBINPATH"]:
                 tpd = os.path.join(self.ppath, 
                                    self.pdata["TRANSLATIONSBINPATH"][0])

eric ide

mercurial