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

More efficient way to add the epoch before version number

Browse source
This commit is contained in:
Erik Johnson 2016-02-08 21:08:51 -06:00
parent e1211ed89f
commit 5244de2fae
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,7 @@ ARCHES_SH = ('sh3', 'sh4', 'sh4a')
ARCHES = ARCHES_64 + ARCHES_32 + ARCHES_PPC + ARCHES_S390 + \
ARCHES_ALPHA + ARCHES_ARM + ARCHES_SH
# EPOCHNUM can't be used until RHEL5 is EOL as it is not present
QUERYFORMAT = '%{NAME}_|-%{EPOCH}_|-%{VERSION}_|-%{RELEASE}_|-%{ARCH}_|-%{REPOID}'
@ -96,6 +97,6 @@ def parse_pkginfo(line, osarch=None):
if release:
version += '-{0}'.format(release)
if epoch not in ('(none)', '0'):
version = '{0}:{1}'.format(epoch, version)
version = ':'.join((epoch, version))
return pkginfo(name, version, arch, repoid)