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

unify behavior of refresh

Browse source
This commit is contained in:
Michael Calmer 2016-02-18 12:30:19 +01:00
parent 174ee10fc2
commit 5836be3f59
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
salt/modules/zypper.py
View file

@ -74,6 +74,11 @@ def list_upgrades(refresh=True):
'''
List all available package upgrades on this system
refresh
force a refresh if set to True (default).
If set to False it depends on zypper if a refresh is
executed.
CLI Example:
.. code-block:: bash
@ -174,6 +179,11 @@ def info_available(*names, **kwargs):
'''
Return the information of the named package available for the system.
refresh
force a refresh if set to True (default).
If set to False it depends on zypper if a refresh is
executed or not.
CLI example:
.. code-block:: bash
@ -656,7 +666,7 @@ def mod_repo(repo, **kwargs):
def refresh_db():
'''
Just run a ``zypper refresh``, return a dict::
Force a repository refresh by calling ``zypper refresh --force``, return a dict::
{'<database name>': Bool}
@ -666,7 +676,7 @@ def refresh_db():
salt '*' pkg.refresh_db
'''
cmd = _zypper('refresh')
cmd = _zypper('refresh', '--force')
ret = {}
call = __salt__['cmd.run_all'](cmd, output_loglevel='trace')
if call['retcode'] != 0:
@ -703,7 +713,7 @@ def install(name=None,
version=None,
**kwargs):
'''
Install the passed package(s), add refresh=True to run 'zypper refresh'
Install the passed package(s), add refresh=True to force a 'zypper refresh'
before package is installed.
name
@ -720,7 +730,9 @@ def install(name=None,
salt '*' pkg.install <package name>
refresh
Whether or not to refresh the package database before installing.
force a refresh if set to True.
If set to False (default) it depends on zypper if a refresh is
executed.
fromrepo
Specify a package repository to install from.
@ -768,6 +780,9 @@ def install(name=None,
{'<package>': {'old': '<old-version>',
'new': '<new-version>'}}
'''
if salt.utils.is_true(refresh):
refresh_db()
try:
pkg_params, pkg_type = __salt__['pkg_resource.parse_targets'](name, pkgs, sources, **kwargs)
except MinionError as exc:
@ -814,8 +829,6 @@ def install(name=None,
else:
fromrepoopt = ''
cmd_install = _zypper()
if not refresh:
cmd_install.append('--no-refresh')
cmd_install += ['install', '--name', '--auto-agree-with-licenses']
if downloadonly:
cmd_install.append('--download-only')
@ -850,6 +863,11 @@ def upgrade(refresh=True):
'''
Run a full system upgrade, a zypper upgrade
refresh
force a refresh if set to True (default).
If set to False it depends on zypper if a refresh is
executed.
Return a dict containing the new package names and versions::
{'<package>': {'old': '<old-version>',