# HG changeset patch # User Sylvain Thénault # Date 1274171434 -7200 # Node ID b75aa6ce0c04fc68655d1a0ac7d3b85ffb2a45a5 # Parent 5cb121d4f02f6978bbd013330c34ed205a34c7f6 [i18ncube] we must load site_cubicweb file before calling set_schema, else we may miss some options or other initialization stuff necessary to appobject loading diff -r 5cb121d4f02f -r b75aa6ce0c04 cwconfig.py --- a/cwconfig.py Tue May 18 10:28:50 2010 +0200 +++ b/cwconfig.py Tue May 18 10:30:34 2010 +0200 @@ -957,7 +957,10 @@ def load_site_cubicweb(self): """load instance's specific site_cubicweb file""" - for path in reversed([self.apphome] + self.cubes_path()): + paths = self.cubes_path() + if self.apphome is not None: + paths = [self.apphome] + paths + for path in reversed(paths): sitefile = join(path, 'site_cubicweb.py') if exists(sitefile) and not sitefile in self._site_loaded: self._load_site_cubicweb(sitefile) diff -r 5cb121d4f02f -r b75aa6ce0c04 devtools/devctl.py --- a/devtools/devctl.py Tue May 18 10:28:50 2010 +0200 +++ b/devtools/devctl.py Tue May 18 10:30:34 2010 +0200 @@ -58,6 +58,7 @@ if cubes: self._cubes = self.reorder_cubes( self.expand_cubes(cubes, with_recommends=True)) + self.load_site_cubicweb() else: self._cubes = ()