# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1254911910 -7200
# Node ID 1b0dbcf4b214267617ef57a066c7d65f10073263
# Parent  a5432f99f2d9f174a91d712295d7699e53f9e58f
merge fix

diff -r a5432f99f2d9 -r 1b0dbcf4b214 hooks/integrity.py
--- a/hooks/integrity.py	Wed Oct 07 12:31:08 2009 +0200
+++ b/hooks/integrity.py	Wed Oct 07 12:38:30 2009 +0200
@@ -201,7 +201,8 @@
         # if the relation is being delete, don't delete composite's components
         # automatically
         pendingrdefs = self._cw.transaction_data.get('pendingrdefs', ())
-        if (self._cw.describe(eidfrom)[0], rtype, self._cw.describe(eidto)[0]) in pendingrdefs:
+        if (self._cw.describe(self.eidfrom)[0], self.rtype,
+            self._cw.describe(self.eidto)[0]) in pendingrdefs:
             return
         composite = self._cw.schema_rproperty(self.rtype, self.eidfrom, self.eidto,
                                                  'composite')