saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove epoch from version string if present when installing with yum

Browse source 
yum install does not support epoch without the arch, and we won't know
what the arch will be when it's not provided. It could either be the OS
architecture, or 'noarch', and we don't make that distinction in the
pkg.list_pkgs return data.

Fixes #31619.
This commit is contained in:
Erik Johnson 2016-03-03 12:52:42 -06:00
parent 10658dffe6
commit 290192af56
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/yumpkg.py
View file

@ -1226,6 +1226,12 @@ def install(name=None,
for pkg_item_list in pkg_params_items:
if pkg_type == 'repository':
pkgname, version_num = pkg_item_list
if _yum() == 'yum':
# yum install does not support epoch without the arch, and we
# won't know what the arch will be when it's not provided. It
# could either be the OS architecture, or 'noarch', and we
# don't make that distinction in the pkg.list_pkgs return data.
version_num = version_num.split(':', 1)[-1]
else:
try:
pkgname, pkgpath, version_num = pkg_item_list