Commit 197cb744 authored by Robert K's avatar Robert K

Bgufix for setup when OPM modules are around.

parent dbfd639c
Pipeline #20134 passed with stage
in 8 minutes and 37 seconds
......@@ -210,7 +210,10 @@ def find_modules(path):
for root, dirs, files in os.walk(dir):
if 'dune.module' in files:
description = Description(os.path.join(root, 'dune.module'))
modules.append((description,os.path.abspath(root)))
if not "opm" in description.name:
if not 'ewoms' in description.name:
modules.append((description,os.path.abspath(root)))
# do not traverse subdirectories
# del dirs[:]
return modules
......@@ -386,8 +389,10 @@ def select_modules(modules=None):
else:
desc[n], dir[n] = d, p
else:
if not is_installed(d, n):
raise KeyError('Multiple source versions for module \'' + n + '\' found.')
# check that the directories are not the same
if not p == dir[n]:
if not is_installed(d, n):
raise KeyError('Multiple source versions for module \'' + n + '\' found.')
else:
desc[n], dir[n] = d, p
return (desc, dir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment