# HG changeset patch # User Sylvain Thénault # Date 1276618784 -7200 # Node ID cd20ddaef124ba4c8be67d86d8da91dcaef31ee2 # Parent b0bb553e3be42545ece1a67b5c4c4ab725a69f26 fix bad merge diff -r b0bb553e3be4 -r cd20ddaef124 cwvreg.py --- a/cwvreg.py Tue Jun 15 18:16:19 2010 +0200 +++ b/cwvreg.py Tue Jun 15 18:19:44 2010 +0200 @@ -521,7 +521,7 @@ if not cube in cubes: cpath = cfg.build_vregistry_cube_path([cfg.cube_dir(cube)]) cleanup_sys_modules(cpath) - self.register_objects(path, force_reload) + self.register_objects(path) CW_EVENT_MANAGER.emit('after-registry-reload') def _set_schema(self, schema):