valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't handle epoch specially for dnf

Browse Source 
Epoch handling is done in salt.utils.pkg.rpm.parse_pkginfo() now, so
remove special handling for dnf and make both yum and dnf work the same.
This commit is contained in:
Erik Johnson 2016-02-08 21:09:43 -06:00
parent 5244de2fae
commit 4b855a85ee
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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]
@ -256,10 +255,6 @@ def _repoquery(repoquery_args,
if 'stdout' in call:
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()