valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added the ability to aptpkg.upgrade to use the upgrade opition with apt-get instead of the dist-upgrade method. Introducing a new argument to the upgrade function, dist-upgrade, which is True by default but can be set to False to use upgrade.

Browse Source
This commit is contained in:
Gareth J. Greenaway 2014-06-08 09:36:01 -07:00
parent 2b8d232130
commit 714f03101c
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/modules/aptpkg.py
View File

@ -546,7 +546,7 @@ def purge(name=None, pkgs=None, **kwargs):
return _uninstall(action='purge', name=name, pkgs=pkgs, **kwargs)
def upgrade(refresh=True, **kwargs):
def upgrade(refresh=True, dist_upgrade=True, **kwargs):
'''
Upgrades all packages via ``apt-get dist-upgrade``
@ -555,6 +555,12 @@ def upgrade(refresh=True, **kwargs):
{'<package>': {'old': '<old-version>',
'new': '<new-version>'}}
dist_upgrade
Whether to perform the upgrade using dist-upgrade vs upgrade. Default
is to use dist-upgrade.
.. versionadded:: Helium
CLI Example:
.. code-block:: bash
@ -565,8 +571,12 @@ def upgrade(refresh=True, **kwargs):
refresh_db()
old = list_pkgs()
cmd = ['apt-get', '-q', '-y', '-o', 'DPkg::Options::=--force-confold',
'-o', 'DPkg::Options::=--force-confdef', 'dist-upgrade']
if dist_upgrade:
cmd = ['apt-get', '-q', '-y', '-o', 'DPkg::Options::=--force-confold',
'-o', 'DPkg::Options::=--force-confdef', 'dist-upgrade']
else:
cmd = ['apt-get', '-q', '-y', '-o', 'DPkg::Options::=--force-confold',
'-o', 'DPkg::Options::=--force-confdef', 'upgrade']
__salt__['cmd.run'](cmd, python_shell=False, output_loglevel='trace')
__context__.pop('pkg.list_pkgs', None)
new = list_pkgs()