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

Fix pkg.installed state summary reporting

Browse Source 
In 03e4e8a the pkg.installed state was altered to not show all the
package names that were modified if a lot of them were changed, and
instead just mention the number of packages that changed. However, the
number that is being reported is the length of the string result of
commaspace-joining the list of modified package names. This results in
incorrect output. This commit fixes that reporting issue.
This commit is contained in:
Erik Johnson 2013-12-01 10:42:08 -06:00
parent 3cd5efe521
commit ba556efee7
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
salt/states/pkg.py
View File

@ -491,11 +491,17 @@ def installed(
else:
summary = ', '.join([_get_desired_pkg(x, desired)
for x in modified])
if len(summary) < 10:
if len(summary) < 20:
comment.append('The following packages were installed/updated: '
'{0}.'.format(summary))
else:
comment.append('{0} packages were installed/updated.'.format(len(summary)))
comment.append(
'{0} targeted package{1} {2} installed/updated.'.format(
len(modified),
's' if len(modified) > 1 else '',
'were' if len(modified) > 1 else 'was'
)
)
if not_modified:
if sources:
@ -503,11 +509,17 @@ def installed(
else:
summary = ', '.join([_get_desired_pkg(x, desired)
for x in not_modified])
if len(summary) <= 10:
if len(not_modified) <= 20:
comment.append('The following packages were already installed: '
'{0}.'.format(summary))
else:
comment.append('{0} packages were already installed.'.format(len(summary)))
comment.append(
'{0} targeted package{1} {2} already installed.'.format(
len(not_modified),
's' if len(not_modified) > 1 else '',
'were' if len(not_modified) > 1 else 'was'
)
)
if failed:
if sources: