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

Add "all_versions" parameter to include all installed version on rpm.info

Browse Source
This commit is contained in:
Pablo Suárez Hernández 2018-05-14 11:33:13 +01:00
parent f5c3e2caec
commit 0aaf724d6c
No known key found for this signature in database
GPG Key ID: A9683F02B512C911
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/modules/rpm.py
View File

@ -453,7 +453,7 @@ def diff(package, path):
return res return res
def info(*packages, **attr): def info(*packages, **kwargs):
''' '''
Return a detailed package(s) summary information. Return a detailed package(s) summary information.
If no packages specified, all packages will be returned. If no packages specified, all packages will be returned.
@ -467,6 +467,9 @@ def info(*packages, **attr):
version, vendor, release, build_date, build_date_time_t, install_date, install_date_time_t, version, vendor, release, build_date, build_date_time_t, install_date, install_date_time_t,
build_host, group, source_rpm, arch, epoch, size, license, signature, packager, url, summary, description. build_host, group, source_rpm, arch, epoch, size, license, signature, packager, url, summary, description.
:param all_versions:
Return information for all installed versions of the packages
:return: :return:
CLI example: CLI example:
@ -476,7 +479,9 @@ def info(*packages, **attr):
salt '*' lowpkg.info apache2 bash salt '*' lowpkg.info apache2 bash
salt '*' lowpkg.info apache2 bash attr=version salt '*' lowpkg.info apache2 bash attr=version
salt '*' lowpkg.info apache2 bash attr=version,build_date_iso,size salt '*' lowpkg.info apache2 bash attr=version,build_date_iso,size
salt '*' lowpkg.info apache2 bash attr=version,build_date_iso,size all_versions=True
''' '''
all_versions = kwargs.get('all_versions', False)
# LONGSIZE is not a valid tag for all versions of rpm. If LONGSIZE isn't # LONGSIZE is not a valid tag for all versions of rpm. If LONGSIZE isn't
# available, then we can just use SIZE for older versions. See Issue #31366. # available, then we can just use SIZE for older versions. See Issue #31366.
rpm_tags = __salt__['cmd.run_stdout']( rpm_tags = __salt__['cmd.run_stdout'](
@ -516,7 +521,7 @@ def info(*packages, **attr):
"edition": "edition: %|EPOCH?{%{EPOCH}:}|%{VERSION}-%{RELEASE}\\n", "edition": "edition: %|EPOCH?{%{EPOCH}:}|%{VERSION}-%{RELEASE}\\n",
} }
attr = attr.get('attr', None) and attr['attr'].split(",") or None attr = kwargs.get('attr', None) and kwargs['attr'].split(",") or None
query = list() query = list()
if attr: if attr:
for attr_k in attr: for attr_k in attr:
@ -610,8 +615,13 @@ def info(*packages, **attr):
if pkg_name.startswith('gpg-pubkey'): if pkg_name.startswith('gpg-pubkey'):
continue continue
if pkg_name not in ret: if pkg_name not in ret:
ret[pkg_name] = pkg_data.copy() if all_versions:
del ret[pkg_name]['edition'] ret[pkg_name] = [pkg_data.copy()]
else:
ret[pkg_name] = pkg_data.copy()
del ret[pkg_name]['edition']
elif all_versions:
ret[pkg_name].append(pkg_data.copy())
return ret return ret