From 94cba7da2ef9e24420df7fe9df6b3bc45dc54de0 Mon Sep 17 00:00:00 2001
From: Jean-Paul Smets <jp@nexedi.com>
Date: Tue, 23 Mar 2010 07:56:17 +0000
Subject: [PATCH] Improved comment
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33980 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5/Document/SolverProcess.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/product/ERP5/Document/SolverProcess.py b/product/ERP5/Document/SolverProcess.py
index 3d6a9061ec7..ec17d68e428 100644
--- a/product/ERP5/Document/SolverProcess.py
+++ b/product/ERP5/Document/SolverProcess.py
@@ -138,15 +138,16 @@ class SolverProcess(XMLObject, ActiveProcess):
for movement, movement_solver_dict in movement_dict.items():
for solver, movement_solver_configuration_list in movement_solver_dict.items():
for configuration_mapping in movement_solver_configuration_list:
+ # Detect conflicts. This includes finding out that a solver which
+ # is exclusive per movement, conflicts with another solver on the same
+ # movement
solver_message_list = solver.getSolverConflictMessageList(movement, configuration_mapping, solver_dict)
if solver_message_list:
message_list.extend(solver_message_list)
continue # No need to keep on
- # Make sure multiple configuration are possible
- try:
- # Solver key contains only those properties which differentiate
- # solvers (ex. there should be only Production Reduction Solver)
- solver_key = solver.getSolverProcessGroupingKey(movement, configuration_mapping, solver_dict)
+ # Solver key contains only those properties which differentiate
+ # solvers (ex. there should be only Production Reduction Solver)
+ solver_key = solver.getSolverProcessGroupingKey(movement, configuration_mapping, solver_dict)
except: # Raise the exception generated by the solver in case of failure of grouping
raise
solver_key_dict = grouped_solver_dict.setdefault(solver, {})
--
2.30.9