X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.py;h=b376d5029d47eb9b2c62e8705489e80fa983e495;hb=ecda7b0d557de2075509ebc610c22f009443f952;hp=d124d06a1274ea991c352788d09eb8f34f61b244;hpb=5c93852e3cc1fe92dc8b58eaa7c726bdfee8e04f;p=lyx.git

diff --git a/lib/configure.py b/lib/configure.py
index d124d06a12..b376d5029d 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1169,22 +1169,32 @@ def checkModulesConfig():
 ## configuration change. 
 ## "ModuleName" "filename" "Description" "Packages" "Requires" "Excludes" "Category"
 ''')
+
   # build the list of available modules
-  foundClasses = []
+  seen = []
+  # note that this searches the local directory first, then the
+  # system directory. that way, we pick up the user's version first.
   for file in glob.glob( os.path.join('layouts', '*.module') ) + \
       glob.glob( os.path.join(srcdir, 'layouts', '*.module' ) ) :
       # valid file?
       logger.info(file)
       if not os.path.isfile(file): 
           continue
-      retval = processModuleFile(file, bool_docbook)
+
+      filename = file.split(os.sep)[-1]
+      filename = filename[:-7]
+      if seen.count(filename):
+          continue
+
+      seen.append(filename)
+      retval = processModuleFile(file, filename, bool_docbook)
       if retval != "":
           tx.write(retval)
   tx.close()
   logger.info('\tdone')
 
 
-def processModuleFile(file, bool_docbook):
+def processModuleFile(file, filename, bool_docbook):
     ''' process module file and get a line of result
 
         The top of a module file should look like this:
@@ -1209,8 +1219,6 @@ def processModuleFile(file, bool_docbook):
     modname = desc = pkgs = req = excl = catgy = ""
     readingDescription = False
     descLines = []
-    filename = file.split(os.sep)[-1]
-    filename = filename[:-7]
 
     for line in open(file).readlines():
       if readingDescription: