ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge pull request #8311 from neersighted/wrap_distroversion

Browse source 
Wrap get_distribution_version() in the hostname module
This commit is contained in:
Michael DeHaan 2014-07-28 15:48:18 -04:00
commit 6300ded89c
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
library/system/hostname
View file

@ -45,6 +45,18 @@ from distutils.version import LooseVersion
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
# wrap get_distribution_version in case it returns a string
def _get_distribution_version():
distribution_version = get_distribution_version()
if type(distribution_version) is str:
distribution_version = 0
elif type(distribution_version) is None:
distribution_version = 0
return distribution_version
class UnimplementedStrategy(object): class UnimplementedStrategy(object):
def __init__(self, module): def __init__(self, module):
self.module = module self.module = module
@ -299,7 +311,7 @@ class RedHat5Hostname(Hostname):
class RedHatServerHostname(Hostname): class RedHatServerHostname(Hostname):
platform = 'Linux' platform = 'Linux'
distribution = 'Red hat enterprise linux server' distribution = 'Red hat enterprise linux server'
distribution_version = get_distribution_version() distribution_version = _get_distribution_version()
if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"): if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"):
strategy_class = FedoraStrategy strategy_class = FedoraStrategy
else: else:
@ -308,7 +320,7 @@ class RedHatServerHostname(Hostname):
class RedHatWorkstationHostname(Hostname): class RedHatWorkstationHostname(Hostname):
platform = 'Linux' platform = 'Linux'
distribution = 'Red hat enterprise linux workstation' distribution = 'Red hat enterprise linux workstation'
distribution_version = get_distribution_version() distribution_version = _get_distribution_version()
if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"): if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"):
strategy_class = FedoraStrategy strategy_class = FedoraStrategy
else: else: