saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #43686 from terminalmage/issue43383

Browse source 
Make git_pillar runner return None when no changes are fetched
This commit is contained in:
Mike Place 2017-09-21 15:44:48 -06:00 • committed by GitHub
commit d7b19ab64f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/runners/git_pillar.py
View file

@ -28,6 +28,11 @@ def update(branch=None, repo=None):
fetched, and ``False`` if there were errors or no new commits were
fetched.
.. versionchanged:: Oxygen
The return for a given git_pillar remote will now be ``None`` when no
changes were fetched. ``False`` now is reserved only for instances in
which there were errors.
Fetch one or all configured git_pillar remotes.
.. note::

6
salt/utils/gitfs.py
View file

@ -1145,7 +1145,7 @@ class GitPython(GitProvider):
new_objs = True
cleaned = self.clean_stale_refs()
return bool(new_objs or cleaned)
return True if (new_objs or cleaned) else None
def file_list(self, tgt_env):
'''
@ -1621,7 +1621,9 @@ class Pygit2(GitProvider):
log.debug('%s remote \'%s\' is up-to-date', self.role, self.id)
refs_post = self.repo.listall_references()
cleaned = self.clean_stale_refs(local_refs=refs_post)
return bool(received_objects or refs_pre != refs_post or cleaned)
return True \
if (received_objects or refs_pre != refs_post or cleaned) \
else None
def file_list(self, tgt_env):
'''