# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1486125452 -3600
# Node ID 3c58ea2fd745b00022f6ff52aee3cb952c7860e2
# Parent  8de62610cea26404646e01b0cdd958f1c616b524# Parent  f96f77a190f2121793081363268250d8a113f442
Merge 3.24.5 into default branch

diff -r 8de62610cea2 -r 3c58ea2fd745 .hgtags
--- a/.hgtags	Tue Jan 10 16:08:55 2017 +0100
+++ b/.hgtags	Fri Feb 03 13:37:32 2017 +0100
@@ -593,3 +593,6 @@
 35fd54c0065d622647f2d1fffc9874a455a1b9be 3.24.4
 35fd54c0065d622647f2d1fffc9874a455a1b9be debian/3.24.4-1
 35fd54c0065d622647f2d1fffc9874a455a1b9be centos/3.24.4-1
+70d28e632206aa1a3d3654f52468deccd2451f4c 3.24.5
+70d28e632206aa1a3d3654f52468deccd2451f4c debian/3.24.5-1
+70d28e632206aa1a3d3654f52468deccd2451f4c centos/3.24.5-1
diff -r 8de62610cea2 -r 3c58ea2fd745 cubicweb.spec
--- a/cubicweb.spec	Tue Jan 10 16:08:55 2017 +0100
+++ b/cubicweb.spec	Fri Feb 03 13:37:32 2017 +0100
@@ -8,7 +8,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           cubicweb
-Version:        3.24.4
+Version:        3.24.5
 Release:        logilab.1%{?dist}
 Summary:        CubicWeb is a semantic web application framework
 Source0:        https://pypi.python.org/packages/source/c/cubicweb/cubicweb-%{version}.tar.gz
diff -r 8de62610cea2 -r 3c58ea2fd745 cubicweb/__pkginfo__.py
diff -r 8de62610cea2 -r 3c58ea2fd745 cubicweb/misc/migration/3.24.0_Any.py
--- a/cubicweb/misc/migration/3.24.0_Any.py	Tue Jan 10 16:08:55 2017 +0100
+++ b/cubicweb/misc/migration/3.24.0_Any.py	Fri Feb 03 13:37:32 2017 +0100
@@ -6,14 +6,15 @@
 rql('DELETE CWProperty X WHERE X pkey "system.version.pyramid"',
     ask_confirm=False)
 
-sql('DROP TABLE moved_entities')
-sql('ALTER TABLE entities DROP COLUMN asource')
 # before removing extid, ensure it's coherent with cwuri
 for eid, etype, encoded_extid in sql(
         "SELECT eid, type, extid FROM entities, cw_CWSource "
         "WHERE cw_CWSource.cw_name=entities.asource AND cw_CWSource.cw_type='ldapfeed'"):
     sql('UPDATE cw_{} SET cw_cwuri=%(cwuri)s WHERE cw_eid=%(eid)s'.format(etype),
         {'eid': eid, 'cwuri': b64decode(encoded_extid)})
+
+sql('DROP TABLE moved_entities')
+sql('ALTER TABLE entities DROP COLUMN asource')
 sql('ALTER TABLE entities DROP COLUMN extid')
 sql('DROP INDEX entities_type_idx')
 
diff -r 8de62610cea2 -r 3c58ea2fd745 cubicweb/misc/migration/3.24.4_Any.py
--- a/cubicweb/misc/migration/3.24.4_Any.py	Tue Jan 10 16:08:55 2017 +0100
+++ b/cubicweb/misc/migration/3.24.4_Any.py	Fri Feb 03 13:37:32 2017 +0100
@@ -14,10 +14,10 @@
             column = 'cw_{0}'.format(rdef.rtype)
             if any(isinstance(cstr, UniqueConstraint) for cstr in rdef.constraints):
                 source.create_index(cnx, table, column, unique=True)
-                commit()
+                commit(ask_confirm=False)
             if rschema.inlined or rdef.indexed:
                 source.create_index(cnx, table, column)
-                commit()
+                commit(ask_confirm=False)
 
 schema_indices = expected_indexes(cnx)
 db_indices = database_indexes(cnx)
diff -r 8de62610cea2 -r 3c58ea2fd745 debian/changelog
--- a/debian/changelog	Tue Jan 10 16:08:55 2017 +0100
+++ b/debian/changelog	Fri Feb 03 13:37:32 2017 +0100
@@ -1,3 +1,9 @@
+cubicweb (3.24.5-1) unstable; urgency=medium
+
+  * New upstream release. 
+
+ -- Sylvain Thenault <sylvain.thenault@logilab.fr>  Tue, 31 Jan 2017 10:40:14 +0100
+
 cubicweb (3.24.4-1) unstable; urgency=medium
 
   * New upstream release.