rpms/system-config-printer/F-9 pycups-1.9.38.tar.bz2.sig, NONE, 1.1 system-config-printer-getfile.patch, NONE, 1.1 sources, 1.169, 1.170 system-config-printer.spec, 1.180, 1.181 pycups-1.9.37.tar.bz2.sig, 1.1, NONE

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3125

Modified Files:
	sources system-config-printer.spec 
Added Files:
	pycups-1.9.38.tar.bz2.sig system-config-printer-getfile.patch 
Removed Files:
	pycups-1.9.37.tar.bz2.sig 
Log Message:
* Fri May  9 2008 Tim Waugh <twaugh at redhat.com> 0.7.82.2-5
- Updated pycups to 1.9.38 for getFile(fd=...).
- Back-ported use of getFile(fd=...) needed for new authconn code
  (bug #443205).



--- NEW FILE pycups-1.9.38.tar.bz2.sig ---
ˆ?
W㣝¿¨²Ü´)ÃŒ8ËóZ
system-config-printer-getfile.patch:

--- NEW FILE system-config-printer-getfile.patch ---
diff -U0 system-config-printer-0.7.82.2/ChangeLog.getfile system-config-printer-0.7.82.2/ChangeLog
--- system-config-printer-0.7.82.2/ChangeLog.getfile	2008-05-09 14:30:05.000000000 +0100
+++ system-config-printer-0.7.82.2/ChangeLog	2008-05-09 14:31:12.000000000 +0100
@@ -2,0 +3,4 @@
+	* cupshelpers.py (Printer.setAsDefault): Try specifying the file
+	descriptor for getFile (requires pycups >= 1.9.38).
+	(PrintersConf.fetch): Likewise.
+
diff -up system-config-printer-0.7.82.2/cupshelpers.py.getfile system-config-printer-0.7.82.2/cupshelpers.py
--- system-config-printer-0.7.82.2/cupshelpers.py.getfile	2008-04-03 13:22:04.000000000 +0100
+++ system-config-printer-0.7.82.2/cupshelpers.py	2008-05-09 14:30:43.000000000 +0100
@@ -356,16 +356,21 @@ class PrintersConf:
 
     def fetch(self, file):
         fd, filename = tempfile.mkstemp("printer.conf")
-        os.close(fd)
         try:
-            self.connection.getFile(file, filename)
+            try:
+                # Specifying the fd is allowed in pycups >= 1.9.38
+                self.connection.getFile(file, fd=fd)
+            except TypeError:
+                self.connection.getFile(file, filename)
         except cups.HTTPError, e:
+            os.close(fd)
             if (e.args[0] == cups.HTTP_UNAUTHORIZED or
                 e.args[0] == cups.HTTP_NOT_FOUND):
                 return []
             else:
                 raise e
 
+        os.close(fd)
         lines = open(filename).readlines()
         os.unlink(filename)
         return lines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/sources,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- sources	3 Apr 2008 13:46:34 -0000	1.169
+++ sources	9 May 2008 13:32:59 -0000	1.170
@@ -1,2 +1,2 @@
-bb9c0fecb8ef37942f3a5de7fa5d16a8  pycups-1.9.37.tar.bz2
 65575d684e4cbb533e899c19443be8d4  system-config-printer-0.7.82.2.tar.bz2
+cf3a3db3f1ff08bdf2c9254086e8ec70  pycups-1.9.38.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- system-config-printer.spec	6 May 2008 10:08:10 -0000	1.180
+++ system-config-printer.spec	9 May 2008 13:32:59 -0000	1.181
@@ -1,17 +1,18 @@
-%define pycups_version 1.9.37
+%define pycups_version 1.9.38
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.82.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: system-config-printer-%{version}.tar.bz2
 Source1: pycups-%{pycups_version}.tar.bz2
 Patch1: system-config-printer-authconn.patch
+Patch2: system-config-printer-getfile.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -57,6 +58,7 @@
 %prep
 %setup -q -a 1
 %patch1 -p1 -b .authconn
+%patch2 -p1 -b .getfile
 
 %build
 %configure
@@ -123,6 +125,11 @@
 exit 0
 
 %changelog
+* Fri May  9 2008 Tim Waugh <twaugh at redhat.com> 0.7.82.2-5
+- Updated pycups to 1.9.38 for getFile(fd=...).
+- Back-ported use of getFile(fd=...) needed for new authconn code
+  (bug #443205).
+
 * Tue May  6 2008 Tim Waugh <twaugh at redhat.com> 0.7.82.2-4
 - Removed other upstream fixes introduced in 0.7.82.2-2.
 


--- pycups-1.9.37.tar.bz2.sig DELETED ---