internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 22:33:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #938 from skvidal/devel

Browse Source 
fix up local_nvra and fix for a missing localinstall rpm file.
This commit is contained in:
Michael DeHaan
2012-08-24 16:46:06 -07:00
parent 4ce5b0caea 5dbc85e8ad
commit 165f4b514d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/yum
View File

@@ -188,7 +188,7 @@ def local_nvra(path):
"""return nvra of a local rpm passed in""" """return nvra of a local rpm passed in"""
cmd = ['/bin/rpm', '-qp' ,'--qf', cmd = ['/bin/rpm', '-qp' ,'--qf',
'%%{name}-%%{version}-%%{release}.%%{arch}\n', path ] '%{name}-%{version}-%{release}.%{arch}\n', path ]
rc, out, err = run(cmd) rc, out, err = run(cmd)
if rc != 0: if rc != 0:
return None return None
@@ -285,6 +285,10 @@ def install(module, items, repoq, yum_basecmd, conf_file):
# localpkg # localpkg
if spec.endswith('.rpm'): if spec.endswith('.rpm'):
# get the pkg name-v-r.arch # get the pkg name-v-r.arch
if not os.path.exists(spec):
res['msg'] += "No Package file matching '%s' found on system" % spec
module.fail_json(**res)
nvra = local_nvra(spec) nvra = local_nvra(spec)
# look for them in the rpmdb # look for them in the rpmdb
if is_installed(repoq, nvra, conf_file): if is_installed(repoq, nvra, conf_file):