02fcdca4e8
- Update to 3.22.4 OBS-URL: https://build.opensuse.org/request/show/975789 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=222
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From 5ff90c0210be6b9b48f5cc269d2450e85a958ec0 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Mon, 16 Mar 2020 14:33:35 +0100
|
|
Subject: [PATCH] Use lsb_release fallback code if "import distro" fails
|
|
|
|
With python 3.8, the standard python "platform" module doesn't
|
|
provide the "dist()" function any more. The "distro" module is
|
|
used instead. However, not all distributions ship the "distro"
|
|
module by default. Catch the resulting exception, and use the
|
|
already existing fallback code to determine the distribution
|
|
using lsb_release.
|
|
---
|
|
base/password.py | 8 ++++++--
|
|
installer/core_install.py | 10 +++++++---
|
|
2 files changed, 13 insertions(+), 5 deletions(-)
|
|
|
|
Index: hplip-3.22.4/installer/core_install.py
|
|
===================================================================
|
|
--- hplip-3.22.4.orig/installer/core_install.py
|
|
+++ hplip-3.22.4/installer/core_install.py
|
|
@@ -651,6 +651,14 @@ class CoreInstall(object):
|
|
name = distro.linux_distribution()[0].lower()
|
|
ver = distro.linux_distribution()[1]
|
|
distro_release_name = distro.distro_release_attr('name')
|
|
+ try:
|
|
+ import distro
|
|
+ name = distro.linux_distribution()[0].lower()
|
|
+ ver = distro.linux_distribution()[1]
|
|
+ distro_release_name = distro.distro_release_attr('name')
|
|
+ except (ImportError, AttributeError):
|
|
+ # Use fallback code below
|
|
+ pass
|
|
if not name:
|
|
found = False
|
|
log.debug("Not able to detect distro")
|