kallithea Changeset - 39bdf0ab2862

Changeset - 39bdf0ab2862

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 7 years ago 2018-08-08 02:23:11
mads@kiilerich.com

hooks: use os.environ directly for KALLITHEA_EXTRAS instead of sometimes passing it as parameter

It is better to be consistent ... even if that means always using the global
environment that is hard to avoid.

4 files changed with 10 insertions and 13 deletions:

kallithea/config/post_receive_tmpl.py

kallithea/config/pre_receive_tmpl.py

kallithea/lib/hooks.py

kallithea/lib/utils2.py

0 comments (0 inline, 0 general)

kallithea/config/post_receive_tmpl.py

➞

Show inline comments

@@ @@ -28,7 +28,7 @@ import kallithea.lib.hooks @@
 def main():
     repo_path = os.path.abspath('.')
     git_stdin_lines = sys.stdin.readlines()
-    sys.exit(kallithea.lib.hooks.handle_git_post_receive(repo_path, git_stdin_lines, os.environ))
     sys.exit(kallithea.lib.hooks.handle_git_post_receive(repo_path, git_stdin_lines))
 if __name__ == '__main__':

kallithea/config/pre_receive_tmpl.py

➞

Show inline comments

@@ @@ -28,7 +28,7 @@ import kallithea.lib.hooks @@
 def main():
     repo_path = os.path.abspath('.')
     git_stdin_lines = sys.stdin.readlines()
-    sys.exit(kallithea.lib.hooks.handle_git_pre_receive(repo_path, git_stdin_lines, os.environ))
     sys.exit(kallithea.lib.hooks.handle_git_pre_receive(repo_path, git_stdin_lines))
 if __name__ == '__main__':

kallithea/lib/hooks.py

➞

Show inline comments

@@ @@ -357,7 +357,7 @@ def log_delete_user(user_dict, deleted_b @@
     return 0
-def _hook_environment(repo_path, env):
 def _hook_environment(repo_path):
     """
     Create a light-weight environment for stand-alone scripts and return an UI and the
     db repository.
@@ @@ -371,7 +371,7 @@ def _hook_environment(repo_path, env): @@
     from kallithea.config.environment import load_environment
     from kallithea.model.base import init_model
-    extras = _extract_extras(env)
     extras = _extract_extras()
     path, ini_name = os.path.split(extras['config'])
     conf = appconfig('config:%s' % ini_name, relative_to=path)
     conf = load_environment(conf.global_conf, conf.local_conf)
@@ @@ -395,16 +395,16 @@ def _hook_environment(repo_path, env): @@
     return baseui, repo
-def handle_git_pre_receive(repo_path, git_stdin_lines, env):
 def handle_git_pre_receive(repo_path, git_stdin_lines):
     """Called from Git pre-receive hook"""
-    baseui, repo = _hook_environment(repo_path, env)
     baseui, repo = _hook_environment(repo_path)
     scm_repo = repo.scm_instance
     push_lock_handling(baseui, scm_repo)
-def handle_git_post_receive(repo_path, git_stdin_lines, env):
 def handle_git_post_receive(repo_path, git_stdin_lines):
     """Called from Git post-receive hook"""
-    baseui, repo = _hook_environment(repo_path, env)
     baseui, repo = _hook_environment(repo_path)
     # the post push hook should never use the cached instance
     scm_repo = repo.scm_instance_no_cache()

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -538,16 +538,13 @@ def get_server_url(environ): @@
     return req.host_url + req.script_name
-def _extract_extras(env=None):
 def _extract_extras():
     """
     Extracts the Kallithea extras data from os.environ, and wraps it into named
     AttributeDict object
     """
     if not env:
         env = os.environ
     try:
-        extras = json.loads(env['KALLITHEA_EXTRAS'])
+        extras = json.loads(os.environ['KALLITHEA_EXTRAS'])
     except KeyError:
         raise Exception("Environment variable KALLITHEA_EXTRAS not found")

0 comments (0 inline, 0 general)