odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Bugfix: while importing and installing .zip files 

bzr revid: nch@tinyerp.com-20081107053510-zhfwalspnk2pewus
This commit is contained in:
Naresh Choksy 2008-11-07 11:05:10 +05:30
parent d11c04894b
commit 808d552be8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/addons/__init__.py
View File

@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved # Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$ # $Id$
# #
@ -176,7 +176,7 @@ def create_graph(module_list, force=None):
continue continue
terp_file = get_module_resource(module, '__terp__.py') terp_file = get_module_resource(module, '__terp__.py')
if not terp_file: continue if not terp_file: continue
if os.path.isfile(terp_file) or zipfile.is_zipfile(mod_path): if os.path.isfile(terp_file) or zipfile.is_zipfile(mod_path+'.zip'):
try: try:
info = eval(tools.file_open(terp_file).read()) info = eval(tools.file_open(terp_file).read())
except: except:
@ -206,7 +206,7 @@ def create_graph(module_list, force=None):
later.add(package) later.add(package)
packages.append((package, deps, datas)) packages.append((package, deps, datas))
packages.pop(0) packages.pop(0)
for package in later: for package in later:
logger.notifyChannel('init', netsvc.LOG_ERROR, 'addon:%s:Unmet dependency' % package) logger.notifyChannel('init', netsvc.LOG_ERROR, 'addon:%s:Unmet dependency' % package)
@ -236,7 +236,7 @@ def load_module_graph(cr, graph, status=None, **kwargs):
sys.stdout.flush() sys.stdout.flush()
pool = pooler.get_pool(cr.dbname) pool = pooler.get_pool(cr.dbname)
modules = pool.instanciate(m, cr) modules = pool.instanciate(m, cr)
cr.execute('select id from ir_module_module where name=%s', (m,)) cr.execute('select id from ir_module_module where name=%s', (m,))
mid = int(cr.rowcount and cr.fetchone()[0] or 0) mid = int(cr.rowcount and cr.fetchone()[0] or 0)
@ -277,7 +277,7 @@ def load_module_graph(cr, graph, status=None, **kwargs):
cr.execute("update ir_module_module set state='installed' where state in ('to upgrade', 'to install') and id=%d", (mid,)) cr.execute("update ir_module_module set state='installed' where state in ('to upgrade', 'to install') and id=%d", (mid,))
cr.commit() cr.commit()
# Update translations for all installed languages # Update translations for all installed languages
modobj = pool.get('ir.module.module') modobj = pool.get('ir.module.module')
if modobj: if modobj:
@ -289,7 +289,7 @@ def load_module_graph(cr, graph, status=None, **kwargs):
cr.execute("""select model,name from ir_model where id not in (select model_id from ir_model_access)""") cr.execute("""select model,name from ir_model where id not in (select model_id from ir_model_access)""")
for (model,name) in cr.fetchall(): for (model,name) in cr.fetchall():
logger.notifyChannel('init', netsvc.LOG_WARNING, 'addon:object %s (%s) has no access rules!' % (model,name)) logger.notifyChannel('init', netsvc.LOG_WARNING, 'addon:object %s (%s) has no access rules!' % (model,name))
pool = pooler.get_pool(cr.dbname) pool = pooler.get_pool(cr.dbname)
cr.execute('select * from ir_model where state=%s', ('manual',)) cr.execute('select * from ir_model where state=%s', ('manual',))
for model in cr.dictfetchall(): for model in cr.dictfetchall():