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 branch '2014.7' into develop

Browse source
This commit is contained in:
Thomas S Hatch 2014-08-13 17:02:19 -06:00
commit 53fed2cc63
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/modules/zypper.py
View file

@ -510,18 +510,6 @@ def mod_repo(repo, **kwargs):
return r.options
def expand_repo_def(repokwargs):
'''
Take a repository definition and expand it to the full pkg repository dict
that can be used for comparison. This is a helper function to make
certain repo managers sane for comparison in the pkgrepo states.
There is no use to calling this function via the CLI.
'''
# Zypp doesn't need the data massaged.
return repokwargs
def refresh_db():
'''
Just run a ``zypper refresh``, return a dict::

5
salt/states/pkgrepo.py
View file

@ -243,7 +243,10 @@ def managed(name, **kwargs):
# out of the state itself and into a module that it makes more sense
# to use. Most package providers will simply return the data provided
# it doesn't require any "specialized" data massaging.
sanitizedkwargs = __salt__['pkg.expand_repo_def'](kwargs)
if 'pkg.expand_repo_def' in __salt__:
sanitizedkwargs = __salt__['pkg.expand_repo_def'](kwargs)
else:
sanitizedkwargs = kwargs
if __grains__['os_family'] == 'Debian':
kwargs['repo'] = _strip_uri(kwargs['repo'])