accidentally 'fixes' ubuntu distribution parsing, this order should not matter, need followup to figure out why this is the case

11 years ago · 6a8062baad
parent 4205d74b11
commit 6a8062baad
2 changed files with 4 additions and 4 deletions
--- a/lib/ansible/module_utils/facts.py
+++ b/lib/ansible/module_utils/facts.py
@ -99,8 +99,8 @@ class Facts(object):
                    ('/etc/os-release', 'SuSE'),
                    ('/etc/gentoo-release', 'Gentoo'),
                    ('/etc/os-release', 'Debian'),
-                    ('/etc/lsb-release', 'Mandriva'),
-                    ('/etc/os-release', 'NA') )
+                    ('/etc/os-release', 'NA'),
+                    ('/etc/lsb-release', 'Mandriva'))
    SELINUX_MODE_DICT = { 1: 'enforcing', 0: 'permissive', -1: 'disabled' }

    # A list of dicts.  If there is a platform with more than one
--- a/v2/ansible/module_utils/facts.py
+++ b/v2/ansible/module_utils/facts.py
@ -99,8 +99,8 @@ class Facts(object):
                    ('/etc/os-release', 'SuSE'),
                    ('/etc/gentoo-release', 'Gentoo'),
                    ('/etc/os-release', 'Debian'),
-                    ('/etc/lsb-release', 'Mandriva'),
-                    ('/etc/os-release', 'NA') )
+                    ('/etc/os-release', 'NA'),
+                    ('/etc/lsb-release', 'Mandriva'))
    SELINUX_MODE_DICT = { 1: 'enforcing', 0: 'permissive', -1: 'disabled' }

    # A list of dicts.  If there is a platform with more than one