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

Merge pull request #432 from fatbox/develop

Browse Source 
[GH-431] Better support for apt in non-interactive environments
This commit is contained in:
Thomas S Hatch 2012-01-04 20:40:11 -08:00
commit 37cc25ea52
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/modules/apt.py
View File

@ -20,7 +20,7 @@ def available_version(name):
salt '*' pkg.available_version <package name>
'''
version = ''
cmd = 'apt-cache show {0} | grep Version'.format(name)
cmd = 'apt-cache -q show {0} | grep Version'.format(name)
out = __salt__['cmd.run_stdout'](cmd)
@ -59,7 +59,7 @@ def refresh_db():
salt '*' pkg.refresh_db
'''
cmd = 'apt-get update'
cmd = 'apt-get -q update'
out = __salt__['cmd.run_stdout'](cmd)
@ -95,7 +95,7 @@ def install(pkg, refresh=False):
ret_pkgs = {}
old_pkgs = list_pkgs()
cmd = 'apt-get -y install {0}'.format(pkg)
cmd = 'DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Options::=--force-confold install {0}'.format(pkg)
__salt__['cmd.run'](cmd)
new_pkgs = list_pkgs()
@ -126,7 +126,7 @@ def remove(pkg):
ret_pkgs = []
old_pkgs = list_pkgs()
cmd = 'apt-get -y remove {0}'.format(pkg)
cmd = 'DEBIAN_FRONTEND=noninteractive apt-get -q -y remove {0}'.format(pkg)
__salt__['cmd.run'](cmd)
new_pkgs = list_pkgs()
for pkg in old_pkgs:
@ -151,7 +151,7 @@ def purge(pkg):
old_pkgs = list_pkgs()
# Remove inital package
purge_cmd = 'apt-get -y purge {0}'.format(pkg)
purge_cmd = 'DEBIAN_FRONTEND=noninteractive apt-get -q -y purge {0}'.format(pkg)
__salt__['cmd.run'](purge_cmd)
new_pkgs = list_pkgs()
@ -187,7 +187,7 @@ def upgrade(refresh=True):
ret_pkgs = {}
old_pkgs = list_pkgs()
cmd = 'apt-get -y dist-upgrade'
cmd = 'DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Options::=--force-confold dist-upgrade'
__salt__['cmd.run'](cmd)
new_pkgs = list_pkgs()