rpms/system-config-printer/F-12 system-config-printer-npinit-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.337, 1.338

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21583

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-npinit-traceback.patch 
Log Message:
- Avoid traceback in NewPrinterGUI.init (bug #550442).

system-config-printer-npinit-traceback.patch:
 system-config-printer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-npinit-traceback.patch ---
diff -up system-config-printer-1.1.16/system-config-printer.py.npinit-traceback system-config-printer-1.1.16/system-config-printer.py
--- system-config-printer-1.1.16/system-config-printer.py.npinit-traceback	2010-01-06 15:38:44.618286232 +0000
+++ system-config-printer-1.1.16/system-config-printer.py	2010-01-06 15:38:54.800408801 +0000
@@ -3974,7 +3974,7 @@ class NewPrinterGUI(GtkGUI):
                     self.auto_make = devid_dict["MFG"]
                     self.auto_model = devid_dict["MDL"]
                     self.auto_driver = None
-                if not self.device or not self.device.id:
+                if self.device and not self.device.id:
                     self.device.id = devid
                     self.device.id_dict = cupshelpers.parseDeviceID (devid)
                 self.mainapp.devid = ""


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -p -r1.337 -r1.338
--- system-config-printer.spec	6 Jan 2010 15:54:16 -0000	1.337
+++ system-config-printer.spec	6 Jan 2010 16:36:21 -0000	1.338
@@ -25,6 +25,8 @@ Patch7: system-config-printer-notificati
 Patch8: system-config-printer-select-nonexistent-printer.patch
 Patch9: system-config-printer-ink-levels.patch
 
+Patch101: pycups-request-readio.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -93,6 +95,10 @@ printers.
 %patch8 -p1 -b .select-nonexistent-printer
 %patch9 -p1 -b .ink-levels
 
+pushd pycups-%{pycups_version}
+%patch101 -p1 -b .request-readio
+popd
+
 %build
 %configure --with-udev-rules --with-polkit-1
 
@@ -209,6 +215,7 @@ exit 0
 
 %changelog
 * Wed Jan  6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
+- Fixed pycups IPPRequest attribute handling bug.
 - Make sure there are enough ink level values (bug #541882).
 - Make sure the printer we added still exists before selecting it
   (bug #551436).