From 6a8062baad3d62613d054d6159b3bd2e2b3aad56 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Tue, 28 Apr 2015 10:16:14 -0400 Subject: [PATCH] accidentally 'fixes' ubuntu distribution parsing, this order should not matter, need followup to figure out why this is the case --- lib/ansible/module_utils/facts.py | 4 ++-- v2/ansible/module_utils/facts.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ansible/module_utils/facts.py b/lib/ansible/module_utils/facts.py index 4689dd2da9..125dbee141 100644 --- 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 diff --git a/v2/ansible/module_utils/facts.py b/v2/ansible/module_utils/facts.py index 4689dd2da9..125dbee141 100644 --- 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