rpms/system-config-printer/F-12 system-config-printer-asyncpk0-fallback.patch, NONE, 1.1 system-config-printer.spec, 1.350, 1.351

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-asyncpk0-fallback.patch 
Log Message:
* Fri Jan 22 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-11
- Mirror asyncpk1 fallback fix in asyncpk0 (bug #557695).


system-config-printer-asyncpk0-fallback.patch:
 asyncpk0.py |   24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

--- NEW FILE system-config-printer-asyncpk0-fallback.patch ---
diff -up system-config-printer-1.1.16/asyncpk0.py.asyncpk0-fallback system-config-printer-1.1.16/asyncpk0.py
--- system-config-printer-1.1.16/asyncpk0.py.asyncpk0-fallback	2009-12-22 14:44:19.000000000 +0000
+++ system-config-printer-1.1.16/asyncpk0.py	2010-01-22 11:11:15.604057182 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-## Copyright (C) 2007, 2008, 2009 Red Hat, Inc.
+## Copyright (C) 2007, 2008, 2009, 2010 Red Hat, Inc.
 ## Copyright (C) 2008 Novell, Inc.
 ## Authors: Tim Waugh <twaugh at redhat.com>, Vincent Untz
 
@@ -122,18 +122,24 @@ class PK0Connection(asyncpk1.PK1Connecti
     def _call_with_pk (self, use_pycups, pk_method_name, pk_args,
                        reply_handler, error_handler, unpack_fn,
                        fallback_fn, args, kwds):
-        asyncmethodcall = _PK0AsyncMethodCall (self._system_bus, self,
-                                               pk_method_name, pk_args,
-                                               reply_handler, error_handler,
-                                               unpack_fn, fallback_fn,
-                                               args, kwds, self._parent)
+        if not use_pycups:
+            try:
+                asyncmethodcall = _PK0AsyncMethodCall (self._system_bus, self,
+                                                       pk_method_name, pk_args,
+                                                       reply_handler,
+                                                       error_handler,
+                                                       unpack_fn, fallback_fn,
+                                                       args, kwds,
+                                                       self._parent)
+                debugprint ("Calling PK method %s" % pk_method_name)
+                asyncmethodcall.call ()
+            except dbus.DBusException, e:
+                debugprint ("D-Bus call failed: %s" % repr (e))
+                use_pycups = True
 
         if use_pycups:
             return asyncmethodcall.call_fallback_fn ()
 
-        debugprint ("Calling PK method %s" % pk_method_name)
-        asyncmethodcall.call ()
-
 if __name__ == '__main__':
     import gobject
     import gtk


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -p -r1.350 -r1.351
--- system-config-printer.spec	19 Jan 2010 12:58:04 -0000	1.350
+++ system-config-printer.spec	22 Jan 2010 11:19:50 -0000	1.351
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.16
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -31,6 +31,7 @@ Patch13: system-config-printer-async-fal
 Patch14: system-config-printer-userdefault-traceback.patch
 Patch15: system-config-printer-serial-widgets.patch
 Patch16: system-config-printer-statereason-tmp.patch
+Patch17: system-config-printer-asyncpk0-fallback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -106,6 +107,7 @@ printers.
 %patch14 -p1 -b .userdefault-traceback
 %patch15 -p1 -b .serial-widgets
 %patch16 -p1 -b .statereason-tmp
+%patch17 -p1 -b .asyncpk0-fallback
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -222,6 +224,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Jan 22 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-11
+- Mirror asyncpk1 fallback fix in asyncpk0 (bug #557695).
+
 * Tue Jan 19 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-10
 - Update pycups to 1.9.48.