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

Merge pull request #6061 from Singletoned/develop

Browse Source 
Renamed git-python to gitpython
This commit is contained in:
David Boucha 2013-07-09 09:50:55 -07:00
commit ad1413dfdc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/fileserver/gitfs.py
View File

@ -5,7 +5,7 @@ After enabling this backend, branches and tags in a remote git repository
are exposed to salt as different environments. This feature is managed by
the fileserver_backend option in the salt master config.
:depends: git-python Python module
:depends: gitpython Python module
'''
# Import python libs
@ -32,7 +32,7 @@ log = logging.getLogger(__name__)
def __virtual__():
'''
Only load if git-python is available
Only load if gitpython is available
'''
if not isinstance(__opts__['gitfs_remotes'], list):
return False
@ -40,7 +40,7 @@ def __virtual__():
return False
if not HAS_GIT:
log.error('Git fileserver backend is enabled in configuration but '
'could not be loaded, is git-python installed?')
'could not be loaded, is gitpython installed?')
return False
if not git.__version__ > '0.3.0':
return False

4
salt/pillar/git_pillar.py
View File

@ -32,11 +32,11 @@ log = logging.getLogger(__name__)
def __virtual__():
'''
Only load if git-python is available
Only load if gitpython is available
'''
if not HAS_GIT:
log.error('Git fileserver backend is enabled in configuration but '
'could not be loaded, is git-python installed?')
'could not be loaded, is gitpython installed?')
return False
if not git.__version__ > '0.3.0':
return False