tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Improve load_modules for exception for issue295

Browse Source 
- use finally to close the cursor
- add rollback if there is an exception
This commit is contained in:
Cédric Krier
2008-08-30 18:13:09 +02:00
parent 9f274ed323
commit c22016d6f5
1 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trytond/module.py
+47 -45
View File
@@ -331,56 +331,58 @@ def register_classes():
def load_modules(database, update_module=False, lang=None):
cursor = database.cursor()
force = []
if update_module:
if 'all' in CONFIG['init']:
cursor.execute("SELECT name FROM ir_module_module " \
"WHERE state != 'uninstallable'")
try:
force = []
if update_module:
if 'all' in CONFIG['init']:
cursor.execute("SELECT name FROM ir_module_module " \
"WHERE state != 'uninstallable'")
else:
cursor.execute("SELECT name FROM ir_module_module " \
"WHERE state IN ('installed', 'to install', " \
"'to upgrade', 'to remove')")
else:
cursor.execute("SELECT name FROM ir_module_module " \
"WHERE state IN ('installed', 'to install', " \
"'to upgrade', 'to remove')")
else:
cursor.execute("SELECT name FROM ir_module_module " \
"WHERE state IN ('installed', 'to upgrade', 'to remove')")
module_list = [name for (name,) in cursor.fetchall()]
for module in CONFIG['init'].keys():
if CONFIG['init'][module]:
module_list.append(module)
for module in CONFIG['update'].keys():
if CONFIG['update'][module]:
module_list.append(module)
graph = create_graph(module_list, force)[0]
"WHERE state IN ('installed', 'to upgrade', 'to remove')")
module_list = [name for (name,) in cursor.fetchall()]
for module in CONFIG['init'].keys():
if CONFIG['init'][module]:
module_list.append(module)
for module in CONFIG['update'].keys():
if CONFIG['update'][module]:
module_list.append(module)
graph = create_graph(module_list, force)[0]
try:
load_module_graph(cursor, graph, lang)
except:
cursor.close()
raise
try:
load_module_graph(cursor, graph, lang)
except:
cursor.rollback()
raise
for kind in ('init', 'update'):
CONFIG[kind] = {}
for kind in ('init', 'update'):
CONFIG[kind] = {}
if update_module:
cursor.execute("SELECT name FROM ir_module_module " \
"WHERE state IN ('to remove')")
for (mod_name,) in cursor.fetchall():
pool = pooler.get_pool(cursor.dbname)
#TODO check if ressource not updated by the user
cursor.execute('SELECT model, db_id FROM ir_model_data ' \
'WHERE module = %s ' \
'ORDER BY id DESC', (mod_name,))
for rmod, rid in cursor.fetchall():
pool.get(rmod).delete(cursor, 0, rid)
if update_module:
cursor.execute("SELECT name FROM ir_module_module " \
"WHERE state IN ('to remove')")
for (mod_name,) in cursor.fetchall():
pool = pooler.get_pool(cursor.dbname)
#TODO check if ressource not updated by the user
cursor.execute('SELECT model, db_id FROM ir_model_data ' \
'WHERE module = %s ' \
'ORDER BY id DESC', (mod_name,))
for rmod, rid in cursor.fetchall():
pool.get(rmod).delete(cursor, 0, rid)
cursor.commit()
cursor.execute("UPDATE ir_module_module SET state = %s " \
"WHERE state IN ('to remove')", ('uninstalled',))
cursor.commit()
cursor.execute("UPDATE ir_module_module SET state = %s " \
"WHERE state IN ('to remove')", ('uninstalled',))
cursor.commit()
pooler.restart_pool(cursor.dbname)
pooler.restart_pool(cursor.dbname)
pool = pooler.get_pool(cursor.dbname)
module_obj = pool.get('ir.module.module')
module_obj.update_list(cursor, 0)
cursor.commit()
cursor.close()
pool = pooler.get_pool(cursor.dbname)
module_obj = pool.get('ir.module.module')
module_obj.update_list(cursor, 0)
cursor.commit()
finally:
cursor.close()