valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add output_loglevel=debug to cmd.run_* functions

Browse Source 
Added this to some function calls in the lowpkg modules that lacked this
change.
This commit is contained in:
Erik Johnson 2014-01-10 19:34:34 -06:00
parent 2541722451
commit f7054177b4
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/apt.py
View File

@ -678,7 +678,7 @@ def _get_upgradable():
'''
cmd = 'apt-get --just-print dist-upgrade'
out = __salt__['cmd.run_all'](cmd).get('stdout', '')
out = __salt__['cmd.run_stdout'](cmd, output_loglevel='debug')
# rexp parses lines that look like the following:
# Conf libxfont1 (1:1.4.5-1 Debian:testing [i386])
@ -743,7 +743,7 @@ def version_cmp(pkg1, pkg2):
for oper, ret in (('lt', -1), ('eq', 0), ('gt', 1)):
cmd = 'dpkg --compare-versions {0!r} {1} ' \
'{2!r}'.format(pkg1, oper, pkg2)
if __salt__['cmd.retcode'](cmd) == 0:
if __salt__['cmd.retcode'](cmd, output_loglevel='debug') == 0:
return ret
except Exception as e:
log.error(e)

14
salt/modules/rpm.py
View File

@ -62,7 +62,8 @@ def list_pkgs(*packages):
cmd = 'rpm -q --qf \'%{{NAME}} %{{VERSION}}\\n\' {0}'.format(
' '.join(packages)
)
for line in __salt__['cmd.run'](cmd).splitlines():
out = __salt__['cmd.run'](cmd, output_loglevel='debug'):
for line in out.splitlines():
if 'is not installed' in line:
errors.append(line)
continue
@ -92,7 +93,8 @@ def verify(*package):
cmd = 'rpm -V {0}'.format(packages)
else:
cmd = 'rpm -Va'
for line in __salt__['cmd.run'](cmd).split('\n'):
out = __salt__['cmd.run'](cmd, output_loglevel='debug')
for line in out.splitlines():
fdict = {'mismatch': []}
if 'missing' in line:
line = ' ' + line
@ -141,7 +143,7 @@ def file_list(*packages):
cmd = 'rpm -qla'
else:
cmd = 'rpm -ql {0}'.format(' '.join(packages))
ret = __salt__['cmd.run'](cmd).splitlines()
ret = __salt__['cmd.run'](cmd, output_loglevel='debug').splitlines()
return {'errors': [], 'files': ret}
@ -168,7 +170,8 @@ def file_dict(*packages):
cmd = 'rpm -q --qf \'%{{NAME}} %{{VERSION}}\\n\' {0}'.format(
' '.join(packages)
)
for line in __salt__['cmd.run'](cmd).splitlines():
out = __salt__['cmd.run'](cmd, output_loglevel='debug')
for line in out.splitlines():
if 'is not installed' in line:
errors.append(line)
continue
@ -177,7 +180,8 @@ def file_dict(*packages):
for pkg in pkgs.keys():
files = []
cmd = 'rpm -ql {0}'.format(pkg)
for line in __salt__['cmd.run'](cmd).splitlines():
out = __salt__['cmd.run'](cmd, output_loglevel='debug')
for line in out.splitlines():
files.append(line)
ret[pkg] = files
return {'errors': errors, 'packages': ret}