VCS.ProjectHelper: changed code to search new style project files first when cloning from a repository.

Mon, 26 Apr 2021 17:19:39 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 26 Apr 2021 17:19:39 +0200
changeset 8263
af06dde4f4ef
parent 8262
2f6310aac6cd
child 8264
f95dde35d0ab

VCS.ProjectHelper: changed code to search new style project files first when cloning from a repository.

eric6/VCS/ProjectHelper.py file | annotate | diff | comparison | revisions
--- a/eric6/VCS/ProjectHelper.py	Sun Apr 25 15:21:50 2021 +0200
+++ b/eric6/VCS/ProjectHelper.py	Mon Apr 26 17:19:39 2021 +0200
@@ -267,10 +267,16 @@
                     ok = vcs.vcsCheckout(vcsDataDict, projectdir, False)
                 if ok:
                     projectdir = os.path.normpath(projectdir)
-                    filters = ["*.epj", "*.e4p"]
+                    # look for JSON style project file first
+                    filters = ["*.epj"]
                     d = QDir(projectdir)
                     plist = d.entryInfoList(filters)
-                    if len(plist):
+                    if not plist:
+                        # look for XML style project file second
+                        filters = ["*.e4p"]
+                        d = QDir(projectdir)
+                        plist = d.entryInfoList(filters)
+                    if plist:
                         if len(plist) == 1:
                             self.project.openProject(
                                 plist[0].absoluteFilePath())

eric ide

mercurial