Commit d472dd1b authored by Arnaud Fontaine's avatar Arnaud Fontaine

Business Template: template_keep_path_list: Consider action chosen by user (8bfcf2b3).

When force is selected, it should be updated regardless of user choice (for
example when `force_install` is set). But usually when installing a bt5, user
selects what should be updated (`object_to_update dict` later filtered to
`update_dict` (to not contain unselected objects)).
parent d6913976
...@@ -1364,7 +1364,7 @@ class ObjectTemplateItem(BaseTemplateItem): ...@@ -1364,7 +1364,7 @@ class ObjectTemplateItem(BaseTemplateItem):
old_obj = container._getOb(object_id, None) old_obj = container._getOb(object_id, None)
object_existed = old_obj is not None object_existed = old_obj is not None
if object_existed: if object_existed:
if context.isKeepObject(path) and force: if context.isKeepObject(path) and path not in update_dict:
# do nothing if the object is specified in keep list in # do nothing if the object is specified in keep list in
# force mode. # force mode.
continue continue
......
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