rpms/system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Initialize downloadable_drivers when OpenPrinting query fails (bug

Browse Source 
#574562).
This commit is contained in:
Tim Waugh 2010-03-22 17:31:40 +00:00
parent f95818ce06
commit f59b3e6ffe
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
system-config-printer-downloadable-drivers.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up system-config-printer-1.1.18/system-config-printer.py.downloadable-drivers system-config-printer-1.1.18/system-config-printer.py
--- system-config-printer-1.1.18/system-config-printer.py.downloadable-drivers 2010-03-10 09:33:46.000000000 +0000
+++ system-config-printer-1.1.18/system-config-printer.py 2010-03-22 17:18:40.177572582 +0000
@@ -6334,6 +6334,7 @@ class NewPrinterGUI(GtkGUI):
# Should report error.
print drivers
print traceback.extract_tb(drivers[2], limit=None)
+ self.downloadable_drivers = dict()
return
self.openprinting_query_handle = None

9
system-config-printer.spec
View File

@ -7,7 +7,7 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.2.0 Version: 1.2.0
Release: 5%{?dist} Release: 6%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/ URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base Group: System Environment/Base
@ -24,6 +24,7 @@ Patch4: system-config-printer-cdi-cmd.patch
Patch5: system-config-printer-kyocera-mita.patch Patch5: system-config-printer-kyocera-mita.patch
Patch6: system-config-printer-cdi-filename.patch Patch6: system-config-printer-cdi-filename.patch
Patch7: system-config-printer-reconnect-error.patch Patch7: system-config-printer-reconnect-error.patch
Patch8: system-config-printer-downloadable-drivers.patch
Patch100: system-config-printer-pycups-build.patch Patch100: system-config-printer-pycups-build.patch
@ -106,6 +107,9 @@ printers.
# Fixed reconnection error handling in IPPAuthOperation class (bug #575198). # Fixed reconnection error handling in IPPAuthOperation class (bug #575198).
%patch7 -p1 -b .reconnect-error %patch7 -p1 -b .reconnect-error
# Initialize downloadable_drivers when OpenPrinting query fails (bug #574562).
%patch8 -p1 -b .downloadable-drivers
pushd pycups-%{pycups_version} pushd pycups-%{pycups_version}
# Fixed pycups build with new distutils. # Fixed pycups build with new distutils.
@ -228,6 +232,9 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Mon Mar 22 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-6
- Initialize downloadable_drivers when OpenPrinting query fails (bug #574562).
* Mon Mar 22 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-5 * Mon Mar 22 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-5
- Fixed pycups build with new distutils. - Fixed pycups build with new distutils.
- Fixed reconnection error handling in IPPAuthOperation class (bug #575198). - Fixed reconnection error handling in IPPAuthOperation class (bug #575198).