diff options
| author | Yogesh Sakhreliya <ysa@tinyerp.com> | 2011-01-04 11:19:25 +0530 |
|---|---|---|
| committer | Yogesh Sakhreliya <ysa@tinyerp.com> | 2011-01-04 11:19:25 +0530 |
| commit | bf5765b3ef0f22dcbca413e86fc39dfef9f1d87f (patch) | |
| tree | a848eec82d13175afe8bfa7fe87f02582b583dcc /bin/addons/base/module/wizard | |
| parent | 3acdf9f9c12ac0acd25f9ff106568e585199b3f8 (diff) | |
| parent | ac3f37be8fd77b207baad3ca6978eb576aa8a204 (diff) | |
Merge with trunk-server
bzr revid: ysa@tinyerp.com-20110104054925-mhs1vnkyqs7z6yy6
Diffstat (limited to 'bin/addons/base/module/wizard')
| -rw-r--r-- | bin/addons/base/module/wizard/base_module_upgrade.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/addons/base/module/wizard/base_module_upgrade.py b/bin/addons/base/module/wizard/base_module_upgrade.py index fd9bde9a129..ca82cfb20d2 100644 --- a/bin/addons/base/module/wizard/base_module_upgrade.py +++ b/bin/addons/base/module/wizard/base_module_upgrade.py @@ -82,12 +82,10 @@ class base_module_upgrade(osv.osv_memory): return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+x['state'], res))} def upgrade_module(self, cr, uid, ids, context=None): - pool = pooler.get_pool(cr.dbname) mod_obj = self.pool.get('ir.module.module') - data_obj = self.pool.get('ir.model.data') ids = mod_obj.search(cr, uid, [('state', 'in', ['to upgrade', 'to remove', 'to install'])]) unmet_packages = [] - mod_dep_obj = pool.get('ir.module.module.dependency') + mod_dep_obj = self.pool.get('ir.module.module.dependency') for mod in mod_obj.browse(cr, uid, ids): depends_mod_ids = mod_dep_obj.search(cr, uid, [('module_id', '=', mod.id)]) for dep_mod in mod_dep_obj.browse(cr, uid, depends_mod_ids): @@ -97,8 +95,9 @@ class base_module_upgrade(osv.osv_memory): raise osv.except_osv(_('Unmet dependency !'), _('Following modules are not installed or unknown: %s') % ('\n\n' + '\n'.join(unmet_packages))) mod_obj.download(cr, uid, ids, context=context) cr.commit() - _, pool = pooler.restart_pool(cr.dbname, update_module=True) + _db, pool = pooler.restart_pool(cr.dbname, update_module=True) + data_obj = pool.get('ir.model.data') id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_upgrade_install') if id2: id2 = data_obj.browse(cr, uid, id2, context=context).res_id |