# HG changeset patch
# User Denis Laxalde <denis.laxalde@logilab.fr>
# Date 1373615726 -7200
# Node ID 7ebf3b1cdb4cdad3d8b0b683d8f653b45be0c0ff
# Parent  4415209bea0a2e74e34b5fc7f21cb86504d0c622
Use the list of cubes from the filesystem when reading the schema from the filesystem

Closes #3007259

diff -r 4415209bea0a -r 7ebf3b1cdb4c server/repository.py
--- 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')
diff -r 4415209bea0a -r 7ebf3b1cdb4c server/serverconfig.py
--- 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