habsi/ansible
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yum: fallback to epoch=0 if not available

Browse Source 
(cherry picked from commit 59702318e1)
This commit is contained in:
Martin Krizek
2017-09-12 21:12:23 +02:00
committed by Toshio Kuratomi
parent 2f3c1867f7
commit 0bbd5c7458
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ansible/modules/packaging/os/yum.py
View File

@ -610,7 +610,7 @@ def local_envra(module, path):
finally:
os.close(fd)
return '%s:%s-%s-%s.%s' % (header[rpm.RPMTAG_EPOCH],
return '%s:%s-%s-%s.%s' % (header[rpm.RPMTAG_EPOCH] or '0',
header[rpm.RPMTAG_NAME],
header[rpm.RPMTAG_VERSION],
header[rpm.RPMTAG_RELEASE],
@ -748,7 +748,7 @@ def install(module, items, repoq, yum_basecmd, conf_file, en_repos, dis_repos, i
elif '://' in spec:
# download package so that we can check if it's already installed
package = fetch_rpm_from_url(spec, module=module)
envra = local_envra(module, package)
envra = local_envra(package)
if is_installed(module, repoq, envra, conf_file, en_repos=en_repos, dis_repos=dis_repos, installroot=installroot):
# if it's there, skip it
continue