From 52fbfa00f9f82c0bda8b868b63166ada87e73910 Mon Sep 17 00:00:00 2001 From: "Wittmer, Christian" Date: Mon, 27 Feb 2017 21:01:02 +0100 Subject: [PATCH] fix for #21729, use VERSION_ID instead of PRETTY_NAME to get release (#21730) * fix for #21729, use VERSION_ID instead of PRETTY_NAME to get release --- lib/ansible/module_utils/facts.py | 2 +- test/units/module_utils/test_distribution_version.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ansible/module_utils/facts.py b/lib/ansible/module_utils/facts.py index 91e951eaf39..09b1071e730 100644 --- a/lib/ansible/module_utils/facts.py +++ b/lib/ansible/module_utils/facts.py @@ -895,7 +895,7 @@ class Distribution(object): if distribution_version: self.facts['distribution_version'] = distribution_version.group(1) if 'open' in data.lower(): - release = re.search("^PRETTY_NAME=[^(]+ \(?([^)]+?)\)", line) + release = re.search('^VERSION_ID="?[0-9]+\.?([0-9]*)"?', line) if release: self.facts['distribution_release'] = release.groups()[0] elif 'enterprise' in data.lower() and 'VERSION_ID' in line: diff --git a/test/units/module_utils/test_distribution_version.py b/test/units/module_utils/test_distribution_version.py index 43663aecd77..c8463f32b88 100644 --- a/test/units/module_utils/test_distribution_version.py +++ b/test/units/module_utils/test_distribution_version.py @@ -153,7 +153,7 @@ CODENAME = Malachite "result":{ "distribution": "openSUSE Leap", "distribution_major_version": "42", - "distribution_release": "x86_64", + "distribution_release": "1", "os_family": "Suse", "distribution_version": "42.1", } @@ -179,7 +179,7 @@ ID_LIKE="suse" 'platform.dist': ('SuSE', '13.2', 'x86_64'), 'result': {'distribution': u'openSUSE', 'distribution_major_version': u'13', - 'distribution_release': u'Harlequin', + 'distribution_release': u'2', 'os_family': u'Suse', 'distribution_version': u'13.2'} }, @@ -196,7 +196,7 @@ ID_LIKE="suse" }, "name": "openSUSE Tumbleweed 20160917", "result": { - "distribution_release": "NA", + "distribution_release": "", "distribution": "openSUSE Tumbleweed", "distribution_major_version": "NA", "os_family": "Suse",