Merge lp:~kangol/openobject-client-web/6.0-fix-get-web-addons into lp:openobject-client-web

[Christophe Simonis (OpenERP)]

Unmerged revisions

4502. By Christophe Simonis (OpenERP) on 2011-02-08

[FIX] avoid "Unrecoverable Error" when cannot get web addons

=== modified file 'addons/openerp/controllers/modules.py'
--- addons/openerp/controllers/modules.py	2011-01-18 11:35:00 +0000
+++ addons/openerp/controllers/modules.py	2011-02-08 16:38:45 +0000
@@ -3,14 +3,27 @@
 import os
 import shutil
 import tempfile
+from functools import wraps
 from cStringIO import StringIO
 
 from openerp.controllers import form
 from openerp.utils import rpc
+from openerp.utils.common import TinyException
 
-from openobject import paths, addons, pooler
+from openobject import paths, addons
 from openobject.tools import extract_zip_file
 
+def catch(exc, value):
+    def decorator(f):
+        @wraps(f)
+        def wrapper(*args, **kwargs):
+            try:
+                return f(*args, **kwargs)
+            except exc:
+                return value
+        return wrapper
+    return decorator
+
 class ModuleForm(form.Form):
     _cp_path = "/openerp/modules"
 
@@ -27,6 +40,7 @@
                 or name not in addons._loaded[cherrypy.session.get('db')])
         ])
 
+    @catch(TinyException, [])
     def get_new_modules(self):
         if not addons.writeable: return []
         modules = rpc.RPCProxy('ir.module.module')