Commit 18ea8d06 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

* ignore exactly same solver before calling SolverTypeInformation.conflictsWithSolver().

* call SolverTypeInformation.conflictsWithSolver() with solver type information instead of its id string.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31492 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 39e2e9c1
......@@ -106,8 +106,10 @@ class SolverProcess(XMLObject, ActiveProcess):
for movement_url, movement_solver_dict in movement_dict.items():
for solver_type, movement_solver_configuration_dict in movement_solver_dict.items():
solver = types_tool[solver_type]
for other_solver in movement_solver_dict.keys():
if solver.conflictsWithSolver(other_solver):
for other_solver_type in movement_solver_dict.keys():
if other_solver_type == solver_type:
continue
if solver.conflictsWithSolver(types_tool[other_solver_type]):
raise "Solver %s conflicts with solver %s on movement %s" % (solver_type, other_solver, movement_url)
# Make sure multiple configuration are possible
try:
......
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