merge stable
authorNicolas Chauvat <nicolas.chauvat@logilab.fr>
Fri, 20 Nov 2009 23:43:49 +0100
branchstable
changeset 3891 b176f345c5b1
parent 3888 6f145783409d (current diff)
parent 3887 130ac9aee402 (diff)
child 3892 c53df9a310a6
child 3893 74f216b69628
merge
--- a/server/hooks.py	Fri Nov 20 15:17:56 2009 +0100
+++ b/server/hooks.py	Fri Nov 20 23:43:49 2009 +0100
@@ -277,6 +277,8 @@
         # recheck pending eids
         if self.eid in self.session.transaction_data.get('pendingeids', ()):
             return
+        if self.rtype in self.session.transaction_data.get('pendingrtypes', ()):
+            return
         if self.session.unsafe_execute(*self._rql()).rowcount < 1:
             etype = self.session.describe(self.eid)[0]
             _ = self.session._