summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-10-24 18:15:53 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-10-25 02:27:39 +0200
commit14a30e74032de0399de3e8ffefbf04c2316070a5 (patch)
treef05ef5d81717b666152f746e9ab6650697f5f400 /app-admin/system-config-printer/files/system-config-printer-1.5.12-catch-urllib-errors.patch
parentnet-libs/libaccounts-glib: python3_9, fix assert failure (diff)
downloadgentoo-14a30e74032de0399de3e8ffefbf04c2316070a5.tar.gz
gentoo-14a30e74032de0399de3e8ffefbf04c2316070a5.tar.bz2
gentoo-14a30e74032de0399de3e8ffefbf04c2316070a5.zip
app-admin/system-config-printer: python3_9 w/ required fixes
Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-admin/system-config-printer/files/system-config-printer-1.5.12-catch-urllib-errors.patch')
-rw-r--r--app-admin/system-config-printer/files/system-config-printer-1.5.12-catch-urllib-errors.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/app-admin/system-config-printer/files/system-config-printer-1.5.12-catch-urllib-errors.patch b/app-admin/system-config-printer/files/system-config-printer-1.5.12-catch-urllib-errors.patch
new file mode 100644
index 000000000000..fbae84426159
--- /dev/null
+++ b/app-admin/system-config-printer/files/system-config-printer-1.5.12-catch-urllib-errors.patch
@@ -0,0 +1,22 @@
+From feed693225cc0c26464bfc0adef21da72581e811 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Thu, 28 Nov 2019 15:45:22 +0100
+Subject: [PATCH] Catch errors from urllib too
+
+---
+ newprinter.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/newprinter.py b/newprinter.py
+index 8b9298887..6c71ec578 100644
+--- a/newprinter.py
++++ b/newprinter.py
+@@ -4183,7 +4183,7 @@ def getNPPPD(self):
+ tmpf.flush ()
+ ppd = cups.PPD(tmpf.name)
+
+- except RuntimeError as e:
++ except (RuntimeError, urllib.error.HTTPError) as e:
+ debugprint ("RuntimeError: " + repr (e))
+ if self.rbtnNPFoomatic.get_active():
+ # Foomatic database problem of some sort.