Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use the list of cubes from the filesystem when reading the schema from the filesystem stable
authorDenis Laxalde <denis.laxalde@logilab.fr>
Fri, 12 Jul 2013 09:55:26 +0200
branchstable
changeset 9165 7ebf3b1cdb4c
parent 9164 4415209bea0a
child 9166 e47e192ea0d9
Use the list of cubes from the filesystem when reading the schema from the filesystem Closes #3007259
server/repository.py file | annotate | diff | comparison | revisions
server/serverconfig.py file | annotate | diff | comparison | revisions 
--- a/server/repository.py	Mon Jul 22 10:55:45 2013 +0200
+++ b/server/repository.py	Fri Jul 12 09:55:26 2013 +0200
@@ -239,7 +239,7 @@
             # load schema from the file system
             if not config.creating:
                 self.warning("set fs instance'schema")
-            self.set_schema(config.load_schema())
+            self.set_schema(config.load_schema(expand_cubes=True))
         else:
             # normal start: load the instance schema from the database
             self.info('loading schema from the repository')
--- a/server/serverconfig.py	Mon Jul 22 10:55:45 2013 +0200
+++ b/server/serverconfig.py	Fri Jul 12 09:55:26 2013 +0200
@@ -361,7 +361,7 @@
             self.init_cubes(self.expand_cubes(origcubes))
         schema = CubicWebSchemaLoader().load(self, **kwargs)
         if expand_cubes:
-            # restaure original value
+            # restore original value
             self._cubes = origcubes
         return schema
cubicweb