From cfa56286603d48d132d493c0421fffda9fd10684 Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Wed, 20 Jul 2011 22:01:46 -0300 Subject: [PATCH] Use isCatalogUpdatable if no update_catalog is provided Due the presence of object_to_update, the API will never update the catalog if we do not provide explicitly values. --- product/ERP5/Tool/TemplateTool.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/product/ERP5/Tool/TemplateTool.py b/product/ERP5/Tool/TemplateTool.py index 5086bc8cee..83d71bc0a2 100644 --- a/product/ERP5/Tool/TemplateTool.py +++ b/product/ERP5/Tool/TemplateTool.py @@ -1404,15 +1404,14 @@ class TemplateTool (BaseTool): log('Execute %r' % before_triggered_bt5_id) imported_bt5.unrestrictedTraverse(before_triggered_bt5_id)() - update_catalog_kw = {} - if update_catalog is not _MARKER: - update_catalog_kw = dict(update_catalog=update_catalog) + if update_catalog is _MARKER and install_kw != {}: + update_catalog = imported_bt5.isCatalogUpdatable() if reinstall: - imported_bt5.install(force=True,**update_catalog_kw) + imported_bt5.install(force=True,update_catalog=update_catalog) else: imported_bt5.install(object_to_update=install_kw, - **update_catalog_kw) + update_catalog=update_catalog) # Run After script list for after_triggered_bt5_id in after_triggered_bt5_id_list: -- 2.30.9