diff -r 28b11ecf319b -r 5d016d5bacca server/msplanner.py --- a/server/msplanner.py Tue Jan 04 09:07:22 2011 +0100 +++ b/server/msplanner.py Tue Jan 04 11:59:11 2011 +0100 @@ -1329,8 +1329,8 @@ # in this case we have to merge input maps before call to # filter so already processed restriction are correctly # removed - solsinputmaps = ppi.merge_input_maps(solindices, - complete=not (final and multifinal)) + solsinputmaps = ppi.merge_input_maps( + solindices, complete=not (final and multifinal)) for solindices, inputmap in solsinputmaps: minrqlst, insertedvars = vfilter.filter( sources, terms, scope, set(solindices), needsel, final) @@ -1347,7 +1347,8 @@ minrqlst, insertedvars = vfilter.filter( sources, terms, scope, solindices, needsel, final) if final: - solsinputmaps = ppi.merge_input_maps(solindices) + solsinputmaps = ppi.merge_input_maps( + solindices, complete=not (final and multifinal)) if len(solsinputmaps) > 1: refrqlst = minrqlst for solindices, inputmap in solsinputmaps: