Show More
@@ -259,14 +259,14 b" def make_ui(read_from='file', path=None," | |||||
259 |
|
259 | |||
260 | baseui = ui.ui() |
|
260 | baseui = ui.ui() | |
261 |
|
261 | |||
262 | #clean the baseui object |
|
262 | # clean the baseui object | |
263 | baseui._ocfg = config.config() |
|
263 | baseui._ocfg = config.config() | |
264 | baseui._ucfg = config.config() |
|
264 | baseui._ucfg = config.config() | |
265 | baseui._tcfg = config.config() |
|
265 | baseui._tcfg = config.config() | |
266 |
|
266 | |||
267 | if read_from == 'file': |
|
267 | if read_from == 'file': | |
268 | if not os.path.isfile(path): |
|
268 | if not os.path.isfile(path): | |
269 | log.warning('Unable to read config file %s' % path) |
|
269 | log.debug('hgrc file is not present at %s skipping...' % path) | |
270 | return False |
|
270 | return False | |
271 | log.debug('reading hgrc from %s' % path) |
|
271 | log.debug('reading hgrc from %s' % path) | |
272 | cfg = config.config() |
|
272 | cfg = config.config() | |
@@ -279,8 +279,8 b" def make_ui(read_from='file', path=None," | |||||
279 | elif read_from == 'db': |
|
279 | elif read_from == 'db': | |
280 | sa = meta.Session |
|
280 | sa = meta.Session | |
281 | ret = sa.query(RhodeCodeUi)\ |
|
281 | ret = sa.query(RhodeCodeUi)\ | |
282 | .options(FromCache("sql_cache_short", |
|
282 | .options(FromCache("sql_cache_short", "get_hg_ui_settings"))\ | |
283 | "get_hg_ui_settings")).all() |
|
283 | .all() | |
284 |
|
284 | |||
285 | hg_ui = ret |
|
285 | hg_ui = ret | |
286 | for ui_ in hg_ui: |
|
286 | for ui_ in hg_ui: |
General Comments 0
You need to be logged in to leave comments.
Login now