rpms/system-config-printer/F-13 system-config-printer-downloadable-drivers.patch, NONE, 1.1 system-config-printer.spec, 1.375, 1.376

[Tim Waugh]

Author: twaugh

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

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