kallithea Changeset - a9bc513a1fe3

Changeset - a9bc513a1fe3

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2010-11-19 00:03:37
marcin@python-works.com

fixed nasty bug with ui()

2 files changed with 9 insertions and 5 deletions:

rhodecode/lib/utils.py

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -264,6 +264,11 @@ def make_ui(read_from='file', path=None, @@
     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 @@ def make_ui(read_from='file', path=None, @@
         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 @@ def make_ui(read_from='file', path=None, @@
             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

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -27,7 +27,7 @@ from mercurial import ui @@
 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 @@ class ScmModel(object): @@
         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):

0 comments (0 inline, 0 general)