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

Merge pull request #31031 from terminalmage/issue31014

Browse source 
More complete fix for #31014
This commit is contained in:
Mike Place 2016-02-09 10:04:41 -07:00
commit 071b9d4904
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
salt/modules/yumpkg.py
View file

@ -238,8 +238,7 @@ def _repoquery(repoquery_args,
'''
_check_repoquery()
if _yum() == 'dnf':
cmd = ['dnf', 'repoquery', '--quiet', '--queryformat',
query_format.replace('-%{VERSION}_', '-%{EPOCH}:%{VERSION}_')]
cmd = ['dnf', 'repoquery', '--quiet', '--queryformat', query_format]
else:
cmd = ['repoquery', '--plugins', '--queryformat', query_format]
@ -257,11 +256,7 @@ def _repoquery(repoquery_args,
comment += call['stdout']
raise CommandExecutionError(comment)
else:
if _yum() == 'dnf':
# Remove the epoch when it is zero to maintain backward compatibility
return call['stdout'].replace('_|-0:', '_|-').splitlines()
else:
return call['stdout'].splitlines()
return call['stdout'].splitlines()
def _get_repo_options(**kwargs):
@ -341,11 +336,11 @@ def _get_branch_option(**kwargs):
# Get branch option from the kwargs
branch = kwargs.get('branch', '')
branch_arg = ''
ret = []
if branch:
log.info('Adding branch \'{0}\''.format(branch))
branch_arg = '--branch=\'{0}\''.format(branch)
return branch_arg
ret.append('--branch=\'{0}\''.format(branch))
return ret
def _get_yum_config():

7
salt/utils/pkg/rpm.py
View file

@ -31,7 +31,8 @@ ARCHES_SH = ('sh3', 'sh4', 'sh4a')
ARCHES = ARCHES_64 + ARCHES_32 + ARCHES_PPC + ARCHES_S390 + \
ARCHES_ALPHA + ARCHES_ARM + ARCHES_SH
QUERYFORMAT = '%{NAME}_|-%{VERSION}_|-%{RELEASE}_|-%{ARCH}_|-%{REPOID}'
# EPOCHNUM can't be used until RHEL5 is EOL as it is not present
QUERYFORMAT = '%{NAME}_|-%{EPOCH}_|-%{VERSION}_|-%{RELEASE}_|-%{ARCH}_|-%{REPOID}'
def get_osarch():
@ -86,7 +87,7 @@ def parse_pkginfo(line, osarch=None):
pkginfo namedtuple.
'''
try:
name, version, release, arch, repoid = line.split('_|-')
name, epoch, version, release, arch, repoid = line.split('_|-')
# Handle unpack errors (should never happen with the queryformat we are
# using, but can't hurt to be careful).
except ValueError:
@ -95,5 +96,7 @@ def parse_pkginfo(line, osarch=None):
name = resolve_name(name, arch, osarch)
if release:
version += '-{0}'.format(release)
if epoch not in ('(none)', '0'):
version = ':'.join((epoch, version))
return pkginfo(name, version, arch, repoid)