From 8ea13cd9f4b4498628483b50706ded86a09c7238 Mon Sep 17 00:00:00 2001 From: Arnon Yaari Date: Sun, 15 Dec 2019 11:18:54 +0200 Subject: [PATCH 1/2] #239 Oracle Enterprise Linux was renamed to Oracle Linux since version 5.x --- distro.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distro.py b/distro.py index 3ce45af..0595b0a 100755 --- a/distro.py +++ b/distro.py @@ -49,7 +49,7 @@ #: #: * Value: Normalized value. NORMALIZED_OS_ID = { - 'ol': 'oracle', # Oracle Enterprise Linux + 'ol': 'oracle', # Oracle Linux } #: Translation table for normalizing the "Distributor ID" attribute returned by @@ -60,7 +60,7 @@ #: #: * Value: Normalized value. NORMALIZED_LSB_ID = { - 'enterpriseenterprise': 'oracle', # Oracle Enterprise Linux + 'enterpriseenterprise': 'oracle', # Oracle Linux 'redhatenterpriseworkstation': 'rhel', # RHEL 6, 7 Workstation 'redhatenterpriseserver': 'rhel', # RHEL 6, 7 Server } From 89fb1712d8ce58174099d2d52d4c17dd54dbca53 Mon Sep 17 00:00:00 2001 From: Arnon Yaari Date: Sun, 15 Dec 2019 11:19:18 +0200 Subject: [PATCH 2/2] #239 fix Oracle Linux 4/5 lsb_release id --- distro.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distro.py b/distro.py index 0595b0a..e51960d 100755 --- a/distro.py +++ b/distro.py @@ -60,7 +60,8 @@ #: #: * Value: Normalized value. NORMALIZED_LSB_ID = { - 'enterpriseenterprise': 'oracle', # Oracle Linux + 'enterpriseenterpriseas': 'oracle', # Oracle Enterprise Linux 4 + 'enterpriseenterpriseserver': 'oracle', # Oracle Linux 5 'redhatenterpriseworkstation': 'rhel', # RHEL 6, 7 Workstation 'redhatenterpriseserver': 'rhel', # RHEL 6, 7 Server }