changeset 724:a9bc513a1fe3 beta

fixed nasty bug with ui()
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 19 Nov 2010 00:03:37 +0100
parents bf26b46e82d6
children 7a6c971a5f0e
files rhodecode/lib/utils.py rhodecode/model/scm.py
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/utils.py	Thu Nov 18 23:11:51 2010 +0100
+++ b/rhodecode/lib/utils.py	Fri Nov 19 00:03:37 2010 +0100
@@ -264,6 +264,11 @@
 
     baseui = ui.ui()
 
+    #clean the baseui object
+    baseui._ocfg = config.config()
+    baseui._ucfg = config.config()
+    baseui._tcfg = config.config()
+
     if read_from == 'file':
         if not os.path.isfile(path):
             log.warning('Unable to read config file %s' % path)
@@ -273,8 +278,9 @@
         cfg.read(path)
         for section in ui_sections:
             for k, v in cfg.items(section):
+                log.debug('settings ui from file[%s]%s:%s', section, k, v)
                 baseui.setconfig(section, k, v)
-                log.debug('settings ui from file[%s]%s:%s', section, k, v)
+
 
     elif read_from == 'db':
         hg_ui = get_hg_ui_cached()
@@ -282,8 +288,6 @@
             if ui_.ui_active:
                 log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, ui_.ui_key, ui_.ui_value)
                 baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value)
-
-
     return baseui
 
 
--- a/rhodecode/model/scm.py	Thu Nov 18 23:11:51 2010 +0100
+++ b/rhodecode/model/scm.py	Fri Nov 19 00:03:37 2010 +0100
@@ -27,7 +27,7 @@
 from rhodecode import BACKENDS
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import HasRepoPermissionAny
-from rhodecode.lib.utils import get_repos
+from rhodecode.lib.utils import get_repos, make_ui
 from rhodecode.model import meta
 from rhodecode.model.db import Repository, User, RhodeCodeUi, CacheInvalidation
 from rhodecode.model.caching_query import FromCache
@@ -73,7 +73,7 @@
         log.info('scanning for repositories in %s', repos_path)
 
         if not isinstance(baseui, ui.ui):
-            baseui = ui.ui()
+            baseui = make_ui('db')
         repos_list = {}
 
         for name, path in get_repos(repos_path):