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

Add rpm verify option to pkg.installed state

Browse Source
This commit is contained in:
jond64 2014-06-07 10:42:24 -05:00
parent f5ea23bc74
commit 3fb733da1e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/states/pkg.py
View File

@ -370,9 +370,9 @@ def _preflight_check(desired, fromrepo, **kwargs):
return ret
def _dump_json_for_comments(obj):
def _nested_output(obj):
'''
Serialize obj to a JSON string and format for comments
Serialize obj and format for output
'''
nested.__opts__ = __opts__
ret = nested.output(obj).rstrip()
@ -723,7 +723,7 @@ def installed(
pkgstr = _get_desired_pkg(x, to_reinstall)
comment.append('\nPackage {0} is set to be reinstalled because the following files have been altered:' \
.format(pkgstr))
comment.append('\n' + _dump_json_for_comments(altered_files[x]))
comment.append('\n' + _nested_output(altered_files[x]))
return {'name': name,
'changes': {},
'result': None,
@ -895,7 +895,7 @@ def installed(
pkgstr = _get_desired_pkg(x, desired)
comment.append('\nPackage {0} was reinstalled. The following files were remediated:' \
.format(pkgstr))
comment.append(_dump_json_for_comments(altered_files[x]))
comment.append(_nested_output(altered_files[x]))
if failed:
# Add a comment for each package in failed with its pkg.verify output
@ -906,7 +906,7 @@ def installed(
pkgstr = _get_desired_pkg(x, desired)
comment.append('\nReinstall was not successful for package {0}. The following files could not be remediated:' \
.format(pkgstr))
comment.append(_dump_json_for_comments(altered_files[x]))
comment.append(_nested_output(altered_files[x]))
result = False
return {'name': name,