From 8e9cbd055a1d4b4ee1da2e783b93e690f6526549 Mon Sep 17 00:00:00 2001 From: Malek Date: Mon, 17 Feb 2020 08:47:22 +0100 Subject: [PATCH] python 3.8 compatibility fix for platform.linux_distribution() --- debian/control | 1 + files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 7cd9478ad4..638885ff94 100644 --- a/debian/control +++ b/debian/control @@ -88,6 +88,7 @@ Depends: policykit-1-gnome, python3, python3-dbus, + python3-distro, python3-gi, python3-gi-cairo, python3-pam | python3-pampy, diff --git a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py index 568b35dd02..3b4d89e60a 100755 --- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py +++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py @@ -6,6 +6,7 @@ import os import re import threading +import distro from SettingsWidgets import SidePage from xapp.GSettingsWidgets import * @@ -105,7 +106,7 @@ def createSystemInfos(): title = ' '.join(contents[:2]) or "Manjaro Linux" infos.append((_("Operating System"), title)) else: - s = '%s (%s)' % (' '.join(platform.linux_distribution()), arch) + s = '%s (%s)' % (' '.join(distro.linux_distribution()), arch) # Normalize spacing in distribution name s = re.sub('\s{2,}', ' ', s) infos.append((_("Operating System"), s))