# HG changeset patch # User domruf # Date 1465932763 -7200 # Node ID 7edd336f88d7b6a0bbcfeeb8c6b4915ec6001d6f # Parent 0bb4fa32a75a5fc3c18a2ae399d52ba8b2a67976 hooks: don't catch ImportError Exceptions in git hooks These hooks are important. Being friendly and hiding errors is not the good kind of friendliness. It is better if they just fail if the Kallithea module can't be imported. diff -r 0bb4fa32a75a -r 7edd336f88d7 kallithea/config/post_receive_tmpl.py --- a/kallithea/config/post_receive_tmpl.py Tue May 03 00:12:55 2016 +0200 +++ b/kallithea/config/post_receive_tmpl.py Tue Jun 14 21:32:43 2016 +0200 @@ -1,25 +1,12 @@ import os import sys -try: - import kallithea - KALLITHEA_HOOK_VER = '_TMPL_' - os.environ['KALLITHEA_HOOK_VER'] = KALLITHEA_HOOK_VER - from kallithea.lib.hooks import handle_git_post_receive as _handler -except ImportError: - if os.environ.get('RC_DEBUG_GIT_HOOK'): - import traceback - print traceback.format_exc() - kallithea = None +KALLITHEA_HOOK_VER = '_TMPL_' +os.environ['KALLITHEA_HOOK_VER'] = KALLITHEA_HOOK_VER +from kallithea.lib.hooks import handle_git_post_receive as _handler def main(): - if kallithea is None: - # exit with success if we cannot import kallithea !! - # this allows simply push to this repo even without - # kallithea - sys.exit(0) - repo_path = os.path.abspath('.') push_data = sys.stdin.readlines() # os.environ is modified here by a subprocess call that diff -r 0bb4fa32a75a -r 7edd336f88d7 kallithea/config/pre_receive_tmpl.py --- a/kallithea/config/pre_receive_tmpl.py Tue May 03 00:12:55 2016 +0200 +++ b/kallithea/config/pre_receive_tmpl.py Tue Jun 14 21:32:43 2016 +0200 @@ -1,25 +1,12 @@ import os import sys -try: - import kallithea - KALLITHEA_HOOK_VER = '_TMPL_' - os.environ['KALLITHEA_HOOK_VER'] = KALLITHEA_HOOK_VER - from kallithea.lib.hooks import handle_git_pre_receive as _handler -except ImportError: - if os.environ.get('RC_DEBUG_GIT_HOOK'): - import traceback - print traceback.format_exc() - kallithea = None +KALLITHEA_HOOK_VER = '_TMPL_' +os.environ['KALLITHEA_HOOK_VER'] = KALLITHEA_HOOK_VER +from kallithea.lib.hooks import handle_git_pre_receive as _handler def main(): - if kallithea is None: - # exit with success if we cannot import kallithea !! - # this allows simply push to this repo even without - # kallithea - sys.exit(0) - repo_path = os.path.abspath('.') push_data = sys.stdin.readlines() # os.environ is modified here by a subprocess call that