merge default heads
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Wed, 16 Feb 2011 10:29:47 +0100
changeset 6998 d662dfdfe495
parent 6995 6efb5a5696bd (current diff)
parent 6992 38f2e306ad8b (diff)
child 6999 e73e05ea8705
merge default heads
--- a/misc/migration/3.11.0_Any.py	Wed Feb 16 08:40:25 2011 +0100
+++ b/misc/migration/3.11.0_Any.py	Wed Feb 16 10:29:47 2011 +0100
@@ -73,8 +73,9 @@
         for rtype in mapping['dont_cross_relations']:
             create_entity('CWSourceSchemaConfig',
                           cw_for_source=source,
-                          cw_schema=session.entity_from_eid(schema[etype].eid),
-                          options=u'dontcross')
+                          cw_schema=session.entity_from_eid(schema[rtype].eid),
+                          options=u'dontcross',
+                          ask_confirm=False)
         # latest update time cwproperty is now a source attribute (latest_retrieval)
         pkey = u'sources.%s.latest-update-time' % source.uri
         rset = session.execute('Any V WHERE X is CWProperty, X value V, X pkey %(k)s',