rpms/system-config-printer/F-12 system-config-printer-async-fallback-2.patch, NONE, 1.1 system-config-printer.spec, 1.351, 1.352
Tim Waugh
twaugh at fedoraproject.org
Sun Jan 24 11:39:47 UTC 2010
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28763
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-async-fallback-2.patch
Log Message:
* Sun Jan 24 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-12
- Fixed async fallback again (bug #557854).
system-config-printer-async-fallback-2.patch:
asyncpk0.py | 15 ++++++++-------
asyncpk1.py | 14 +++++++-------
2 files changed, 15 insertions(+), 14 deletions(-)
--- NEW FILE system-config-printer-async-fallback-2.patch ---
diff -up system-config-printer-1.1.16/asyncpk0.py.async-fallback-2 system-config-printer-1.1.16/asyncpk0.py
--- system-config-printer-1.1.16/asyncpk0.py.async-fallback-2 2010-01-24 10:54:59.873184145 +0000
+++ system-config-printer-1.1.16/asyncpk0.py 2010-01-24 11:04:13.158307567 +0000
@@ -122,15 +122,16 @@ 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:
diff -up system-config-printer-1.1.16/asyncpk1.py.async-fallback-2 system-config-printer-1.1.16/asyncpk1.py
--- system-config-printer-1.1.16/asyncpk1.py.async-fallback-2 2010-01-24 10:54:59.855184707 +0000
+++ system-config-printer-1.1.16/asyncpk1.py 2010-01-24 11:04:13.160307392 +0000
@@ -288,15 +288,15 @@ class PK1Connection:
def _call_with_pk (self, use_pycups, pk_method_name, pk_args,
reply_handler, error_handler, unpack_fn,
fallback_fn, args, kwds):
+ asyncmethodcall = _PK1AsyncMethodCall (self._system_bus, self,
+ pk_method_name, pk_args,
+ reply_handler,
+ error_handler,
+ unpack_fn, fallback_fn,
+ args, kwds)
+
if not use_pycups:
try:
- asyncmethodcall = _PK1AsyncMethodCall (self._system_bus, self,
- pk_method_name, pk_args,
- reply_handler,
- error_handler,
- unpack_fn, fallback_fn,
- args, kwds)
-
debugprint ("Calling PK method %s" % pk_method_name)
asyncmethodcall.call ()
except dbus.DBusException, e:
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -p -r1.351 -r1.352
--- system-config-printer.spec 22 Jan 2010 11:19:50 -0000 1.351
+++ system-config-printer.spec 24 Jan 2010 11:39:47 -0000 1.352
@@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.1.16
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@@ -32,6 +32,7 @@ Patch14: system-config-printer-userdefau
Patch15: system-config-printer-serial-widgets.patch
Patch16: system-config-printer-statereason-tmp.patch
Patch17: system-config-printer-asyncpk0-fallback.patch
+Patch18: system-config-printer-async-fallback-2.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -108,6 +109,7 @@ printers.
%patch15 -p1 -b .serial-widgets
%patch16 -p1 -b .statereason-tmp
%patch17 -p1 -b .asyncpk0-fallback
+%patch18 -p1 -b .async-fallback-2
%build
%configure --with-udev-rules --with-polkit-1
@@ -224,6 +226,9 @@ rm -rf %buildroot
exit 0
%changelog
+* Sun Jan 24 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-12
+- Fixed async fallback again (bug #557854).
+
* Fri Jan 22 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-11
- Mirror asyncpk1 fallback fix in asyncpk0 (bug #557695).
More information about the scm-commits
mailing list