valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work around upstream pygit2 bug

Browse Source 
See https://github.com/saltstack/salt/issues/28072 and
https://github.com/libgit2/pygit2/issues/583.

Fixes #28072.
This commit is contained in:
Erik Johnson 2015-11-19 13:56:03 -06:00
parent 732f5364a2
commit 82e223087e
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
salt/utils/gitfs.py
View File

@ -697,6 +697,9 @@ class Pygit2(GitProvider):
def __init__(self, opts, remote, per_remote_defaults,
override_params, cache_root, role='gitfs'):
self.provider = 'pygit2'
self.use_callback = \
distutils.version.LooseVersion(pygit2.__version__) >= \
distutils.version.LooseVersion('0.23.2')
GitProvider.__init__(self, opts, remote, per_remote_defaults,
override_params, cache_root, role)
@ -937,22 +940,38 @@ class Pygit2(GitProvider):
'''
origin = self.repo.remotes[0]
refs_pre = self.repo.listall_references()
fetch_kwargs = {}
if self.credentials is not None:
origin.credentials = self.credentials
if self.use_callback:
fetch_kwargs['callbacks'] = \
pygit2.RemoteCallbacks(credentials=self.credentials)
else:
origin.credentials = self.credentials
try:
fetch_results = origin.fetch()
fetch_results = origin.fetch(**fetch_kwargs)
except GitError as exc:
# Using exc.__str__() here to avoid deprecation warning
# when referencing exc.message
if 'unsupported url protocol' in exc.__str__().lower() \
exc_str = exc.__str__().lower()
if 'unsupported url protocol' in exc_str \
and isinstance(self.credentials, pygit2.Keypair):
log.error(
'Unable to fetch SSH-based {0} remote \'{1}\'. '
'libgit2 must be compiled with libssh2 to support '
'SSH authentication.'.format(self.role, self.id)
)
return False
raise
elif 'authentication required but no callback set' in exc_str:
log.error(
'{0} remote \'{1}\' requires authentication, but no '
'authentication configured'.format(self.role, self.id)
)
else:
log.error(
'Error occured fetching {0} remote \'{1}\': {2}'.format(
self.role, self.id, exc
)
)
return False
try:
# pygit2.Remote.fetch() returns a dict in pygit2 < 0.21.0
received_objects = fetch_results['received_objects']
@ -1092,6 +1111,7 @@ class Pygit2(GitProvider):
authenticaion.
'''
self.credentials = None
if os.path.isabs(self.url):
# If the URL is an absolute file path, there is no authentication.
return True