rpms/system-config-printer/devel system-config-printer-getdevices.patch, 1.2, 1.3 system-config-printer.spec, 1.277, 1.278

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer-getdevices.patch 
	system-config-printer.spec 
Log Message:
* Thu Aug 13 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-2
- Updated cupspk DevicesGet call for accepted API.


system-config-printer-getdevices.patch:
 cupspk.py |   69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

Index: system-config-printer-getdevices.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-getdevices.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- system-config-printer-getdevices.patch	7 Aug 2009 17:12:29 -0000	1.2
+++ system-config-printer-getdevices.patch	13 Aug 2009 16:40:49 -0000	1.3
@@ -1,7 +1,7 @@
 diff -up system-config-printer-1.1.11/cupspk.py.getdevices system-config-printer-1.1.11/cupspk.py
 --- system-config-printer-1.1.11/cupspk.py.getdevices	2009-08-05 11:33:24.000000000 +0100
-+++ system-config-printer-1.1.11/cupspk.py	2009-08-07 18:05:45.528421465 +0100
-@@ -300,7 +300,53 @@ class Connection:
++++ system-config-printer-1.1.11/cupspk.py	2009-08-13 17:39:34.251284301 +0100
+@@ -300,7 +300,74 @@ class Connection:
  #    getPPDs
  #    getServerPPD
  #    getDocument
@@ -10,13 +10,34 @@ diff -up system-config-printer-1.1.11/cu
 +
 +    def getDevices(self, *args, **kwds):
 +        use_pycups = False
-+        pk_args = ()
++
++        timeout = 0
++        include_schemes = ''
++        exclude_schemes = ''
++
++        if len(args) == 3:
++            (use_pycups, timeout, include_schemes, exclude_schemes) = self._args_to_tuple([int, str, str], *args)
++        else:
++            if kwds.has_key('timeout'):
++                timeout = kwds['timeout']
++
++            if kwds.has_key('include_schemes'):
++                include_schemes = kwds['include_schemes']
++
++            if kwds.has_key('exclude_schemes'):
++                exclude_schemes = kwds['exclude_schemes']
++
++        pk_args = (timeout, include_schemes, exclude_schemes)
 +
 +        result = self._call_with_pk_and_fallback(use_pycups,
 +                                                 'DevicesGet', pk_args,
 +                                                 self._connection.getDevices,
 +                                                 *args, **kwds)
 +
++        # return 'result' if fallback was called
++        if len (result.keys()) > 0 and type (result[result.keys()[0]]) == dict:
++             return result
++
 +        result_str = {}
 +        if result != None:
 +            for i in result.keys():
@@ -37,7 +58,7 @@ diff -up system-config-printer-1.1.11/cu
 +            device_uri = None
 +            device_dict = {}
 +            for i in device_keys:
-+                key = i[:len(i)-len(postfix)]
++                key = i[:len(i) - len(postfix)]
 +                if key != 'device-uri':
 +                    device_dict[key] = result_str[i]
 +                else:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- system-config-printer.spec	7 Aug 2009 17:12:29 -0000	1.277
+++ system-config-printer.spec	13 Aug 2009 16:40:49 -0000	1.278
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -183,6 +183,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Aug 13 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-2
+- Updated cupspk DevicesGet call for accepted API.
+
 * Fri Aug  7 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-1
 - 1.1.11:
   - Several udev-configure-printer fixes.