[MERGE] from trunk

[odoo/odoo.git] / openerp-server

diff --git a/openerp-server b/openerp-server
index 5d717c8..12b6962 100755 (executable)
--- a/openerp-server
+++ b/openerp-server
@@ -30,6 +30,7 @@ GNU Public Licence.
 (c) 2003-TODAY, Fabien Pinckaers - OpenERP SA
 """
 
+import imp
 import logging
 import os
 import signal
@@ -104,7 +105,7 @@ def run_test_file(dbname, test_file):
         db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
         cr = db.cursor()
         _logger.info('loading test file %s', test_file)
-        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
+        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), {}, 'test', True)
         cr.rollback()
         cr.close()
     except Exception:
@@ -202,7 +203,7 @@ def quit_on_signals():
     try:
         while quit_signals_received == 0:
             time.sleep(60)
-    except KeyboardInterrupt:
+    except KeyboardInterrupt, e:
         pass
 
     if config['pidfile']: