module needs to be passed to local_nvra

pull/1887/head
Pepe Barbe 12 years ago
parent ef38e9f0e6
commit 8b4bd2ec3e

@ -262,7 +262,7 @@ def what_provides(module, repoq, req_spec, conf_file, qf=def_qf, en_repos=[], d
return [] return []
def local_nvra(path): def local_nvra(module, 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',
@ -343,7 +343,7 @@ def install(module, items, repoq, yum_basecmd, conf_file, en_repos, dis_repos):
res['msg'] += "No Package file matching '%s' found on system" % spec res['msg'] += "No Package file matching '%s' found on system" % spec
module.fail_json(**res) module.fail_json(**res)
nvra = local_nvra(spec) nvra = local_nvra(module, spec)
# look for them in the rpmdb # look for them in the rpmdb
if is_installed(module, repoq, nvra, conf_file, en_repos=en_repos, dis_repos=dis_repos): if is_installed(module, repoq, nvra, conf_file, en_repos=en_repos, dis_repos=dis_repos):
# if they are there, skip it # if they are there, skip it

Loading…
Cancel
Save