From d5fd588b34e8c402157e1596bbee32f7d418f258 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Tue, 19 Nov 2019 01:35:23 +0530 Subject: [PATCH] distribution: ignore plesk-release file while parsing (#64665) /etc/plesk-release file is now ignored while parsing distribution release. Fixes: #64101 Signed-off-by: Abhijeet Kasurde --- changelogs/fragments/distribution_release.yml | 2 ++ lib/ansible/module_utils/distro/_distro.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/distribution_release.yml diff --git a/changelogs/fragments/distribution_release.yml b/changelogs/fragments/distribution_release.yml new file mode 100644 index 0000000000..20353b8f83 --- /dev/null +++ b/changelogs/fragments/distribution_release.yml @@ -0,0 +1,2 @@ +minor_changes: +- Ignore plesk-release file while parsing distribution release (https://github.com/ansible/ansible/issues/64101). diff --git a/lib/ansible/module_utils/distro/_distro.py b/lib/ansible/module_utils/distro/_distro.py index e982770f74..5f9a421340 100644 --- a/lib/ansible/module_utils/distro/_distro.py +++ b/lib/ansible/module_utils/distro/_distro.py @@ -94,7 +94,9 @@ _DISTRO_RELEASE_IGNORE_BASENAMES = ( 'lsb-release', 'oem-release', _OS_RELEASE_BASENAME, - 'system-release' + 'system-release', + # Fixed in upstream via https://github.com/nir0s/distro/pull/246 + 'plesk-release' )