# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1335529358 -7200
# Node ID 76ce456f8f076a0614670b733dbcd843788801bc
# Parent  f42dcb798142f82c03c2478129abdcf7ce7a4d80# Parent  a9a7ae11dfb0a4289dfb0b26c04abd775d763ae0
[merge] backport stable

diff -r f42dcb798142 -r 76ce456f8f07 .hgtags
--- a/.hgtags	Wed Apr 25 11:39:14 2012 +0200
+++ b/.hgtags	Fri Apr 27 14:22:38 2012 +0200
@@ -252,3 +252,5 @@
 75364c0994907764715bd5011f6a59d934dbeb7d cubicweb-debian-version-3.14.6-1
 0642b2d03acaa5e065cae7590e82b388a280ca22 cubicweb-version-3.15.0
 925db25a3250c5090cf640fc2b02bde5818b9798 cubicweb-debian-version-3.15.0-1
+3ba3ee5b3a89a54d1dc12ed41d5c12232eda1952 cubicweb-version-3.14.7
+20ee573bd2379a00f29ff27bb88a8a3344d4cdfe cubicweb-debian-version-3.14.7-1
diff -r f42dcb798142 -r 76ce456f8f07 __pkginfo__.py
diff -r f42dcb798142 -r 76ce456f8f07 cwconfig.py
--- a/cwconfig.py	Wed Apr 25 11:39:14 2012 +0200
+++ b/cwconfig.py	Fri Apr 27 14:22:38 2012 +0200
@@ -692,7 +692,9 @@
         vregpath = []
         if evobjpath is None:
             evobjpath = cls.cubicweb_appobject_path
-        for subdir in evobjpath:
+        # NOTE: for the order, see http://www.cubicweb.org/ticket/2330799
+        #       it is clearly a workaround
+        for subdir in sorted(evobjpath, key=lambda x:x != 'entities'):
             path = join(CW_SOFTWARE_ROOT, subdir)
             if exists(path):
                 vregpath.append(path)
@@ -704,7 +706,8 @@
         if tvobjpath is None:
             tvobjpath = cls.cube_appobject_path
         for directory in templpath:
-            for subdir in tvobjpath:
+            # NOTE: for the order, see http://www.cubicweb.org/ticket/2330799
+            for subdir in sorted(tvobjpath, key=lambda x:x != 'entities'):
                 path = join(directory, subdir)
                 if exists(path):
                     vregpath.append(path)
diff -r f42dcb798142 -r 76ce456f8f07 debian/changelog
--- a/debian/changelog	Wed Apr 25 11:39:14 2012 +0200
+++ b/debian/changelog	Fri Apr 27 14:22:38 2012 +0200
@@ -4,6 +4,12 @@
 
  -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Thu, 12 Apr 2012 13:52:05 +0200
 
+cubicweb (3.14.7-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- David Douard <david.douard@logilab.fr>  Wed, 11 Apr 2012 09:28:46 +0200
+
 cubicweb (3.14.6-1) unstable; urgency=low
 
   * new upstream release
diff -r f42dcb798142 -r 76ce456f8f07 misc/migration/3.14.4_Any.py
--- a/misc/migration/3.14.4_Any.py	Wed Apr 25 11:39:14 2012 +0200
+++ b/misc/migration/3.14.4_Any.py	Fri Apr 27 14:22:38 2012 +0200
@@ -5,6 +5,7 @@
 attrtype = y2sql.type_from_constraints(dbhelper, rdefdef.object, rdefdef.constraints).split()[0]
 
 cursor = session.cnxset['system']
+sql('UPDATE entities SET asource = source WHERE asource is NULL')
 dbhelper.change_col_type(cursor, 'entities', 'asource', attrtype, False)
 dbhelper.change_col_type(cursor, 'entities', 'source', attrtype, False)
 dbhelper.change_col_type(cursor, 'deleted_entities', 'source', attrtype, False)