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

Merge pull request #2845 from robinsmidsrod/apt-confdef

Browse Source 
Add option to apt-get calls to update unmodified config files
This commit is contained in:
Thomas S Hatch 2012-12-10 06:12:15 -08:00
commit ef1f58cbbc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/apt.py
View File

@ -204,8 +204,9 @@ def install(name=None, refresh=False, repo='', skip_verify=False,
if kwargs.get(vkey) is not None:
fname = '"{0}{1}{2}"'.format(fname, vsign, kwargs[vkey])
break
cmd = 'apt-get -q -y {confold} {verify} {target} install {pkg}'.format(
cmd = 'apt-get -q -y {confold} {confdef} {verify} {target} install {pkg}'.format(
confold='-o DPkg::Options::=--force-confold',
confdef='-o DPkg::Options::=--force-confdef',
verify='--allow-unauthenticated' if skip_verify else '',
target='-t {0}'.format(repo) if repo else '',
pkg=fname,
@ -293,7 +294,7 @@ def upgrade(refresh=True, **kwargs):
ret_pkgs = {}
old_pkgs = list_pkgs()
cmd = 'apt-get -q -y -o DPkg::Options::=--force-confold dist-upgrade'
cmd = 'apt-get -q -y -o DPkg::Options::=--force-confold -o DPkg::Options::=--force-confdef dist-upgrade'
__salt__['cmd.run'](cmd)
new_pkgs = list_pkgs()