kallithea Changeset - cbf0775ff6b4

Changeset - cbf0775ff6b4

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-09-26 21:04:27
marcin@python-works.com

There's no need to use special env variable for config file, it's already passed in in extras now

2 files changed with 3 insertions and 6 deletions:

rhodecode/lib/hooks.py

rhodecode/lib/middleware/pygrack.py

0 comments (0 inline, 0 general)

rhodecode/lib/hooks.py

➞

Show inline comments

@@ @@ -317,8 +317,9 @@ def handle_git_receive(repo_path, revs, @@
     from rhodecode.model import init_model
     from rhodecode.model.db import RhodeCodeUi
     from rhodecode.lib.utils import make_ui
     extras = json.loads(env['RHODECODE_EXTRAS'])
-    path, ini_name = os.path.split(env['RHODECODE_CONFIG_FILE'])
+    path, ini_name = os.path.split(extras['config'])
     conf = appconfig('config:%s' % ini_name, relative_to=path)
     load_environment(conf.global_conf, conf.local_conf)
@@ @@ -337,7 +338,6 @@ def handle_git_receive(repo_path, revs, @@
     _hooks = dict(baseui.configitems('hooks')) or {}
     extras = json.loads(env['RHODECODE_EXTRAS'])
     for k, v in extras.items():
         baseui.setconfig('rhodecode_extras', k, v)
     repo = repo.scm_instance

rhodecode/lib/middleware/pygrack.py

➞

Show inline comments

@@ @@ -118,18 +118,15 @@ class GitRepository(object): @@
         try:
             gitenv = os.environ
             from rhodecode import CONFIG
             from rhodecode.lib.compat import json
             gitenv['RHODECODE_EXTRAS'] = json.dumps(self.extras)
             # forget all configs
             gitenv['GIT_CONFIG_NOGLOBAL'] = '1'
             # we need current .ini file used to later initialize rhodecode
             # env and connect to db
             gitenv['RHODECODE_CONFIG_FILE'] = CONFIG['__file__']
             opts = dict(
                 env=gitenv,
                 cwd=os.getcwd()
+            )
             out = subprocessio.SubprocessIOChunker(
                 r'git %s --stateless-rpc "%s"' % (git_command[4:],
                                                   self.content_path),

0 comments (0 inline, 0 general)