android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-23 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Canonicalize project hooks path before use"

Browse Source
This commit is contained in:
Conley Owens 2014-01-09 02:11:09 +00:00 committed by Gerrit Code Review
commit bd80f7eedd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project.py
View File

@ -83,7 +83,7 @@ def _ProjectHooks():
""" """
global _project_hook_list global _project_hook_list
if _project_hook_list is None: if _project_hook_list is None:
d = os.path.abspath(os.path.dirname(__file__)) d = os.path.realpath(os.path.abspath(os.path.dirname(__file__)))
d = os.path.join(d , 'hooks') d = os.path.join(d , 'hooks')
_project_hook_list = [os.path.join(d, x) for x in os.listdir(d)] _project_hook_list = [os.path.join(d, x) for x in os.listdir(d)]
return _project_hook_list return _project_hook_list
@ -2016,7 +2016,7 @@ class Project(object):
self._InitHooks() self._InitHooks()
def _InitHooks(self): def _InitHooks(self):
hooks = self._gitdir_path('hooks') hooks = os.path.realpath(self._gitdir_path('hooks'))
if not os.path.exists(hooks): if not os.path.exists(hooks):
os.makedirs(hooks) os.makedirs(hooks)
for stock_hook in _ProjectHooks(): for stock_hook in _ProjectHooks():