rpms/system-config-printer/F-11 system-config-printer-downloadable-drivers.patch, NONE, 1.1 system-config-printer.spec, 1.352, 1.353

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5335

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-downloadable-drivers.patch 
Log Message:
* Mon Mar 22 2010 Tim Waugh <twaugh at redhat.com> - 1.1.18-4
- Initialize downloadable_drivers when OpenPrinting query fails (bug #574562).


system-config-printer-downloadable-drivers.patch:
 system-config-printer.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE system-config-printer-downloadable-drivers.patch ---
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


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -p -r1.352 -r1.353
--- system-config-printer.spec	22 Mar 2010 13:00:39 -0000	1.352
+++ system-config-printer.spec	22 Mar 2010 17:30:45 -0000	1.353
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.18
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 
 Patch1: system-config-printer-missing-imports.patch
 Patch2: system-config-printer-reconnect-error.patch
+Patch3: system-config-printer-downloadable-drivers.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -71,6 +72,9 @@ the configuration tool.
 # Fixed reconnection error handling in IPPAuthOperation class (bug #575198).
 %patch2 -p1 -b .reconnect-error
 
+# Initialize downloadable_drivers when OpenPrinting query fails (bug #574562).
+%patch3 -p1 -b .downloadable-drivers
+
 %build
 %configure
 
@@ -177,6 +181,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Mar 22 2010 Tim Waugh <twaugh at redhat.com> - 1.1.18-4
+- Initialize downloadable_drivers when OpenPrinting query fails (bug #574562).
+
 * Mon Mar 22 2010 Tim Waugh <twaugh at redhat.com> - 1.1.18-3
 - Fixed reconnection error handling in IPPAuthOperation class (bug #575198).