rpms/system-config-printer/F-11 pycups-request-readio.patch, NONE, 1.1 system-config-printer.spec, 1.325, 1.326

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	pycups-request-readio.patch 
Log Message:
* Wed Jan  6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
- Fixed pycups IPPRequest attribute handling bug.


pycups-request-readio.patch:
 cupsipp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pycups-request-readio.patch ---
diff -U0 pycups-1.9.47/ChangeLog.request-readio pycups-1.9.47/ChangeLog
diff -up pycups-1.9.47/cupsipp.c.request-readio pycups-1.9.47/cupsipp.c
--- pycups-1.9.47/cupsipp.c.request-readio	2009-08-18 11:56:03.000000000 +0100
+++ pycups-1.9.47/cupsipp.c	2010-01-06 15:54:37.978283521 +0000
@@ -1,6 +1,6 @@
 /*
  * cups - Python bindings for CUPS
- * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009  Red Hat, Inc.
+ * Copyright (C) 2002, 2005, 2006, 2007, 2008, 2009, 2010  Red Hat, Inc.
  * Author: Tim Waugh <twaugh at redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -421,7 +421,7 @@ IPPRequest_getAttributes (IPPRequest *se
 	if (!value) {
 	  Py_DECREF (values);
 	  values = NULL;
-	  break;
+	  continue;
 	}
 
 	debugprintf ("\n");


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -r1.325 -r1.326
--- system-config-printer.spec	6 Jan 2010 15:53:32 -0000	1.325
+++ system-config-printer.spec	6 Jan 2010 16:29:35 -0000	1.326
@@ -24,6 +24,8 @@ Patch6: system-config-printer-notificati
 Patch7: system-config-printer-select-nonexistent-printer.patch
 Patch8: 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
@@ -80,6 +82,10 @@ the configuration tool.
 %patch7 -p1 -b .select-nonexistent-printer
 %patch8 -p1 -b .ink-levels
 
+pushd pycups-%{pycups_version}
+%patch101 -p1 -b .request-readio
+popd
+
 %build
 %configure
 
@@ -186,6 +192,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).