Prefer dnf to yum.

On Fedora 22 and later, yum is deprecated and dnf is installed by
default. However, the detection do not seems to take this in account,
and always use yum, even when yum cli is just a wrapper to tell "use
dnf", as this is the case on F22 and later ( see package dnf-yum ).

As dnf is not installed by default, except on F22, this shouldn't
break anything.
This commit is contained in:
Michael Scherer 2015-04-15 16:11:08 -04:00
parent 460dc5e4db
commit f624ec4cb8
2 changed files with 2 additions and 0 deletions

View file

@ -106,6 +106,7 @@ class Facts(object):
# package manager, put the preferred one last. If there is an # package manager, put the preferred one last. If there is an
# ansible module, use that as the value for the 'name' key. # ansible module, use that as the value for the 'name' key.
PKG_MGRS = [ { 'path' : '/usr/bin/yum', 'name' : 'yum' }, PKG_MGRS = [ { 'path' : '/usr/bin/yum', 'name' : 'yum' },
{ 'path' : '/usr/bin/dnf', 'name' : 'dnf' },
{ 'path' : '/usr/bin/apt-get', 'name' : 'apt' }, { 'path' : '/usr/bin/apt-get', 'name' : 'apt' },
{ 'path' : '/usr/bin/zypper', 'name' : 'zypper' }, { 'path' : '/usr/bin/zypper', 'name' : 'zypper' },
{ 'path' : '/usr/sbin/urpmi', 'name' : 'urpmi' }, { 'path' : '/usr/sbin/urpmi', 'name' : 'urpmi' },

View file

@ -105,6 +105,7 @@ class Facts(object):
# package manager, put the preferred one last. If there is an # package manager, put the preferred one last. If there is an
# ansible module, use that as the value for the 'name' key. # ansible module, use that as the value for the 'name' key.
PKG_MGRS = [ { 'path' : '/usr/bin/yum', 'name' : 'yum' }, PKG_MGRS = [ { 'path' : '/usr/bin/yum', 'name' : 'yum' },
{ 'path' : '/usr/bin/dnf', 'name' : 'dnf' },
{ 'path' : '/usr/bin/apt-get', 'name' : 'apt' }, { 'path' : '/usr/bin/apt-get', 'name' : 'apt' },
{ 'path' : '/usr/bin/zypper', 'name' : 'zypper' }, { 'path' : '/usr/bin/zypper', 'name' : 'zypper' },
{ 'path' : '/usr/sbin/urpmi', 'name' : 'urpmi' }, { 'path' : '/usr/sbin/urpmi', 'name' : 'urpmi' },