From a843faf44cc8fada36fb483de831569fb961d33f Mon Sep 17 00:00:00 2001 From: "tfr@openerp.com" <> Date: Tue, 31 May 2011 16:25:45 +0200 Subject: [PATCH] [FIX] import table with no data inside made crash resolve dependencies bzr revid: tfr@openerp.com-20110531142545-l130b9b6xffdrcew --- addons/import_base/import_framework.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/import_base/import_framework.py b/addons/import_base/import_framework.py index 6380af7736a..d041951ca11 100644 --- a/addons/import_base/import_framework.py +++ b/addons/import_base/import_framework.py @@ -140,7 +140,7 @@ class import_framework(Thread): and each data_i have a external id => in data_id['id'] """ if not datas: - return + return (0, 'No data in this table') mapping['id'] = 'id_new' res = [] @@ -374,9 +374,11 @@ class import_framework(Thread): for dependency in dep: if not dependency in imported: to_import = self.get_mapping()[dependency].get('import', True) - self._resolve_dependencies(self.get_mapping()[dependency].get('dependencies', []), imported) + res = self._resolve_dependencies(self.get_mapping()[dependency].get('dependencies', []), imported) + result.extend(res) if to_import: - (position, warning) = self._import_table(dependency) + r = self._import_table(dependency) + (position, warning) = r result.append((dependency, position, warning)) imported.add(dependency) return result