yum: fallback to epoch=0 if not available

(cherry picked from commit 59702318e1)
pull/30252/head
Martin Krizek 7 years ago committed by Toshio Kuratomi
parent 2f3c1867f7
commit 0bbd5c7458

@ -610,7 +610,7 @@ def local_envra(module, path):
finally: finally:
os.close(fd) 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_NAME],
header[rpm.RPMTAG_VERSION], header[rpm.RPMTAG_VERSION],
header[rpm.RPMTAG_RELEASE], 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: elif '://' in spec:
# download package so that we can check if it's already installed # download package so that we can check if it's already installed
package = fetch_rpm_from_url(spec, module=module) 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 is_installed(module, repoq, envra, conf_file, en_repos=en_repos, dis_repos=dis_repos, installroot=installroot):
# if it's there, skip it # if it's there, skip it
continue continue

Loading…
Cancel
Save