mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-11 00:07:51 +03:00
1d4d1949ad
* Patch is test specific so revbump is unnesessary. Signed-off-by: Alfred Wingate <parona@protonmail.com> Signed-off-by: Marek Szuba <marecki@gentoo.org>
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From ec8cab726abe60ba5c7ffcce07905b29c5376163 Mon Sep 17 00:00:00 2001
|
|
From: Alfred Wingate <parona@protonmail.com>
|
|
Date: Mon, 13 Nov 2023 16:21:44 +0200
|
|
Subject: [PATCH] Add non-systemd method to get distro name and version
|
|
|
|
--- a/tests/utils.py
|
|
+++ b/tests/utils.py
|
|
@@ -514,10 +514,16 @@ def get_version():
|
|
""" Try to get distro and version
|
|
"""
|
|
|
|
- bus = dbus.SystemBus()
|
|
+ try:
|
|
+ bus = dbus.SystemBus()
|
|
+
|
|
+ # get information about the distribution from systemd (hostname1)
|
|
+ sys_info = bus.get_object("org.freedesktop.hostname1", "/org/freedesktop/hostname1")
|
|
+ except dbus.exceptions.DBusException:
|
|
+ import platform
|
|
+ info = platform.freedesktop_os_release()
|
|
+ return (info["NAME"], info["VERSION_ID"])
|
|
|
|
- # get information about the distribution from systemd (hostname1)
|
|
- sys_info = bus.get_object("org.freedesktop.hostname1", "/org/freedesktop/hostname1")
|
|
cpe = str(sys_info.Get("org.freedesktop.hostname1", "OperatingSystemCPEName", dbus_interface=dbus.PROPERTIES_IFACE))
|
|
|
|
if cpe:
|
|
--
|
|
2.42.1
|
|
|