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

Merge pull request #46080 from terminalmage/salt-jenkins-844

Browse Source 
Correct the version number in upstream pygit2 workaround
This commit is contained in:
Nicole Thomas 2018-02-16 16:53:52 -05:00 committed by GitHub
commit 0e8f476a01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/utils/gitfs.py
View File

@ -104,8 +104,8 @@ try:
# Work around upstream bug where bytestrings were being decoded using the
# default encoding (which is usually ascii on Python 2). This was fixed
# on 2 Feb 2018, so releases prior to 0.26.2 will need a workaround.
if PYGIT2_VERSION <= _LooseVersion('0.26.2'):
# on 2 Feb 2018, so releases prior to 0.26.3 will need a workaround.
if PYGIT2_VERSION <= _LooseVersion('0.26.3'):
try:
import pygit2.ffi
import pygit2.remote
@ -1682,7 +1682,7 @@ class Pygit2(GitProvider):
origin = self.repo.remotes[0]
refs_pre = self.repo.listall_references()
fetch_kwargs = {}
# pygit2 0.23.2 brought
# pygit2 radically changed fetchiing in 0.23.2
if self.remotecallbacks is not None:
fetch_kwargs['callbacks'] = self.remotecallbacks
else: