changeset 2411:d3978233fcfa beta

chmod the hooks to 755, like all other githooks. fix hook template name
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 07 Jun 2012 13:09:07 +0200
parents a1595b6e1445
children 708f70d4f8ef
files rhodecode/config/post_receive_tmpl.py rhodecode/config/pre_receive_tmpl.py rhodecode/model/repo.py
diffstat 3 files changed, 31 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rhodecode/config/post_receive_tmpl.py	Thu Jun 07 13:09:07 2012 +0200
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+import os
+import sys
+
+try:
+    import rhodecode
+    from rhodecode.lib.hooks import handle_git_post_receive
+except ImportError:
+    rhodecode = None
+
+
+def main():
+    if rhodecode is None:
+        # exit with success if we cannot import rhodecode !!
+        # this allows simply push to this repo even without
+        # rhodecode
+        sys.exit(0)
+
+    repo_path = os.path.abspath('.')
+    push_data = sys.stdin.read().strip().split(' ')
+    # os.environ is modified here by a subprocess call that
+    # runs git and later git executes this hook.
+    # Environ get's some additional info from rhodecode system
+    # like IP or username from basic-auth
+    handle_git_post_receive(repo_path, push_data, os.environ)
+    sys.exit(0)
+
+if __name__ == '__main__':
+    main()
--- a/rhodecode/config/pre_receive_tmpl.py	Wed Jun 06 23:46:40 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-try:
-    import rhodecode
-    from rhodecode.lib.hooks import handle_git_post_receive
-except ImportError:
-    rhodecode = None
-
-
-def main():
-    if rhodecode is None:
-        # exit with success if we cannot import rhodecode !!
-        # this allows simply push to this repo even without
-        # rhodecode
-        sys.exit(0)
-
-    repo_path = os.path.abspath('.')
-    push_data = sys.stdin.read().strip().split(' ')
-    # os.environ is modified here by a subprocess call that
-    # runs git and later git executes this hook.
-    # Environ get's some additional info from rhodecode system
-    # like IP or username from basic-auth
-    handle_git_post_receive(repo_path, push_data, os.environ)
-    sys.exit(0)
-
-if __name__ == '__main__':
-    main()
--- a/rhodecode/model/repo.py	Wed Jun 06 23:46:40 2012 +0200
+++ b/rhodecode/model/repo.py	Thu Jun 07 13:09:07 2012 +0200
@@ -474,12 +474,12 @@
                 os.makedirs(loc)
 
             tmpl = pkg_resources.resource_string(
-                'rhodecode', jn('config', 'pre_receive_tmpl.py')
+                'rhodecode', jn('config', 'post_receive_tmpl.py')
             )
             _hook_file = jn(loc, 'post-receive')
             with open(_hook_file, 'wb') as f:
                 f.write(tmpl)
-            os.chmod(_hook_file, 0555)
+            os.chmod(_hook_file, 0755)
 
         else:
             raise Exception('Undefined alias %s' % alias)