From 48b49cc303280bfe35bdc6364edbca2630a76ce3 Mon Sep 17 00:00:00 2001 From: liyuan Date: Thu, 2 Nov 2023 18:28:17 +0800 Subject: [PATCH] backport Fix TypeError raised by debugprint call --- ...-TypeError-raised-by-debugprint-call.patch | 29 +++++++++++++++++++ system-config-printer.spec | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0005-Fix-TypeError-raised-by-debugprint-call.patch diff --git a/0005-Fix-TypeError-raised-by-debugprint-call.patch b/0005-Fix-TypeError-raised-by-debugprint-call.patch new file mode 100644 index 0000000..23de7cc --- /dev/null +++ b/0005-Fix-TypeError-raised-by-debugprint-call.patch @@ -0,0 +1,29 @@ +From 4ab0958643827777f526b180ece874d40009986d Mon Sep 17 00:00:00 2001 +From: Tomas Korbar +Date: Thu, 27 Sep 2018 17:27:39 +0200 +Subject: [PATCH] Fix TypeError raised by debugprint call + +- this error is caused by typo in options.py:424 debugprint call +- debugprint function takes only one parameter so i think it should +have been formated string +- fix https://bugzilla.redhat.com/show_bug.cgi?id=1619593 +--- + options.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/options.py b/options.py +index 4dc0b1fe..d756f98d 100644 +--- a/options.py ++++ b/options.py +@@ -421,7 +421,7 @@ class OptionSelectOne(Option): + self.selector.set_active(selected) + else: + debugprint("Unknown value for %s: %s" % (name, value)) +- debugprint("Choices:", supported) ++ debugprint("Choices: %s" % (supported)) + if len(supported) > 0: + debugprint("Selecting from choices:", supported[0]) + self.selector.set_active(0) +-- +2.33.0 + diff --git a/system-config-printer.spec b/system-config-printer.spec index e58989b..d6aefdc 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -3,7 +3,7 @@ Name: system-config-printer Summary: a graphical tool for CUPS administration Version: 1.5.11 -Release: 18 +Release: 19 License: GPLv2+ URL: https://github.com/zdohnal/system-config-printer Source0: https://github.com/zdohnal/system-config-printer/archive/%{version}.tar.gz @@ -12,6 +12,7 @@ Patch0001: 0001-Fix-constructing-the-auth-dialog.patch Patch0002: 0002-Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch Patch0003: 0003-Set-programe-name-for-scp-dbus-service-as-well.patch Patch0004: 0004-Fix-typo-in-debugprint-call.patch +Patch0005: 0005-Fix-TypeError-raised-by-debugprint-call.patch BuildRequires: libusb1-devel gcc gettext-devel systemd xmlto systemd-devel python3-devel BuildRequires: intltool cups-devel >= 1.2 desktop-file-utils >= 0.2.92 pkgconfig(glib-2.0) @@ -87,6 +88,9 @@ rm -rf /var/cache/foomatic/foomatic.pickle exit 0 %changelog +* Thu Nov 02 2023 liyuanyuan - 1.5.11-19 +- Fix TypeError raised by debugprint call + * Thu Oct 26 2023 liyuanyuan - 1.5.11-18 - Fix typo in debugprint call -- Gitee