58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
|
From fe825bf76f7a6727a3654c96e7bc55ddc7069b76 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Petr Lautrbach <lautrbach@redhat.com>
|
||
|
|
Date: Fri, 18 Nov 2022 13:51:53 +0100
|
||
|
|
Subject: [PATCH] python/sepolicy: Use distro module to get os version
|
||
|
|
Content-type: text/plain
|
||
|
|
|
||
|
|
distro module uses /etc/os-release file which contains operating system
|
||
|
|
identification data, see os-release(5). Given that the mechanism doesn't
|
||
|
|
use `rpm` it should be possible to generate man pages on other
|
||
|
|
distributions.
|
||
|
|
|
||
|
|
Signed-off-by: Petr Lautrbach <lautrbach@redhat.com>
|
||
|
|
---
|
||
|
|
python/sepolicy/sepolicy/__init__.py | 25 ++++++-------------------
|
||
|
|
1 file changed, 6 insertions(+), 19 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
|
||
|
|
index 9c3caa05b80b..baa4c8e62e97 100644
|
||
|
|
--- a/python/sepolicy/sepolicy/__init__.py
|
||
|
|
+++ b/python/sepolicy/sepolicy/__init__.py
|
||
|
|
@@ -1226,27 +1226,14 @@ def boolean_desc(boolean):
|
||
|
|
|
||
|
|
|
||
|
|
def get_os_version():
|
||
|
|
- os_version = ""
|
||
|
|
- pkg_name = "selinux-policy"
|
||
|
|
+ system_release = ""
|
||
|
|
try:
|
||
|
|
- try:
|
||
|
|
- from commands import getstatusoutput
|
||
|
|
- except ImportError:
|
||
|
|
- from subprocess import getstatusoutput
|
||
|
|
- rc, output = getstatusoutput("rpm -q '%s'" % pkg_name)
|
||
|
|
- if rc == 0:
|
||
|
|
- os_version = output.split(".")[-2]
|
||
|
|
- except:
|
||
|
|
- os_version = ""
|
||
|
|
-
|
||
|
|
- if os_version[0:2] == "fc":
|
||
|
|
- os_version = "Fedora" + os_version[2:]
|
||
|
|
- elif os_version[0:2] == "el":
|
||
|
|
- os_version = "RHEL" + os_version[2:]
|
||
|
|
- else:
|
||
|
|
- os_version = ""
|
||
|
|
+ import distro
|
||
|
|
+ system_release = distro.name(pretty=True)
|
||
|
|
+ except IOError:
|
||
|
|
+ system_release = "Misc"
|
||
|
|
|
||
|
|
- return os_version
|
||
|
|
+ return system_release
|
||
|
|
|
||
|
|
|
||
|
|
def reinit():
|
||
|
|
--
|
||
|
|
2.38.1
|
||
|
|
|