Launchpad automatic translations update.

[odoo/odoo.git] / bin / tools / yaml_import.py

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 7ebc1a3..fed3e81 100644 (file)
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -419,8 +419,10 @@ class YamlInterpreter(object):
     
     def process_context(self, node):
         self.context = node.__dict__
-        if 'uid' in node.__dict__:
-            self.uid = self.get_id(node.__dict__['uid'])
+        if node.uid:
+            self.uid = self.get_id(node.uid)
+        if node.noupdate:
+            self.noupdate = node.noupdate
     
     def process_python(self, node):
         def log(msg, *args):
@@ -716,12 +718,8 @@ class YamlInterpreter(object):
                 self._process_node(node)
             except YamlImportException, e:
                 self.logger.log(logging.ERROR, e)
-            except YamlImportAbortion, e:
-                self.logger.log(logging.ERROR, e)
-                self.cr.rollback()
-                return
             except Exception, e:
-                self.cr.rollback()
+                self.logger.log(logging.ERROR, e)
                 raise e
     
     def _process_node(self, node):