kallithea Changeset - 7b809e4a1ea5

Changeset - 7b809e4a1ea5

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 5 years ago 2020-11-04 14:30:48
mads@kiilerich.com

Grafted from: 18bef9719f66

git: don't force exact mode on Git hooks when making them executable - use umask

2 files changed with 7 insertions and 2 deletions:

kallithea/lib/utils2.py

kallithea/model/scm.py

0 comments (0 inline, 0 general)

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -80,6 +80,11 @@ assert safe_str @@
 assert LazyProperty
 # get current umask value without changing it
 umask = os.umask(0)
 os.umask(umask)
 def convert_line_endings(line, mode):
     """
     Converts a given line  "line end" according to given mode

kallithea/model/scm.py

➞

Show inline comments

@@ @@ -41,7 +41,7 @@ from kallithea.lib.auth import HasPermis @@
 from kallithea.lib.exceptions import IMCCommitError, NonRelativePathError
 from kallithea.lib.hooks import process_pushed_raw_ids
 from kallithea.lib.utils import action_logger, get_filesystem_repos, make_ui
 from kallithea.lib.utils2 import safe_bytes, safe_str, set_hook_environment
+from kallithea.lib.utils2 import safe_bytes, safe_str, set_hook_environment, umask
 from kallithea.lib.vcs import get_repo
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.vcs.exceptions import RepositoryError, VCSError
@@ @@ -711,7 +711,7 @@ class ScmModel(object): @@
                     fh, fn = tempfile.mkstemp(prefix=hook_file + '.tmp.')
                     os.write(fh, tmpl.replace(b'_TMPL_', safe_bytes(kallithea.__version__)))
                     os.close(fh)
-                    os.chmod(fn, 0o755)
+                    os.chmod(fn, 0o777 & ~umask)
                     os.rename(fn, hook_file)
                 except (OSError, IOError) as e:
                     log.error('error writing hook %s: %s', hook_file, e)

0 comments (0 inline, 0 general)