X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=openerp-server;h=f574ebb354f8405250159f885dffa4cefd80fe19;hb=0d3bf8d1a21cae4d8bb70009fc34ad3520ca224c;hp=d402f3560380f59c4a8725f40f2637204b67d2b5;hpb=23eb63f139266a749f53c05848ce883250b383d0;p=odoo%2Fodoo.git

diff --git a/openerp-server b/openerp-server
index d402f35..f574ebb 100755
--- a/openerp-server
+++ b/openerp-server
@@ -169,7 +169,7 @@ def dumpstacks(sig, frame):
     id2name = dict([(threadId, thread.getName()) for threadId, thread in thread_map.items()])
     code = []
     for threadId, stack in sys._current_frames().items():
-        code.append("\n# Thread: %s(%d)" % (id2name[threadId], threadId))
+        code.append("\n# Thread: %s(%d)" % (id2name.get(threadId,'n/a'), threadId))
         for filename, lineno, name, line in traceback.extract_stack(stack):
             code.append('File: "%s", line %d, in %s' % (filename, lineno, name))
             if line:
@@ -207,6 +207,12 @@ def quit_on_signals():
     openerp.service.stop_services()
     sys.exit(0)
 
+def configure_babel_localedata_path():
+    # Workaround: py2exe and babel.
+    if hasattr(sys, 'frozen'):
+        import babel
+        babel.localedata._dirname = os.path.join(os.path.dirname(sys.executable), 'localedata')
+
 if __name__ == "__main__":
 
     os.environ["TZ"] = "UTC"
@@ -220,6 +226,8 @@ if __name__ == "__main__":
 
     config = openerp.tools.config
 
+    configure_babel_localedata_path()
+
     setup_signal_handlers()
 
     if config["test_file"]:
@@ -241,11 +249,7 @@ if __name__ == "__main__":
 
     for m in openerp.conf.server_wide_modules:
         try:
-            __import__('openerp.addons.' + m)
-            # Call any post_load hook.
-            info = openerp.modules.module.load_information_from_description_file(m)
-            if info['post_load']:
-                getattr(sys.modules[m], info['post_load'])()
+            openerp.modules.module.load_openerp_module(m)
         except Exception:
             msg = ''
             if m == 'web':