rpms/system-config-printer/F-10 system-config-printer-monitor-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.240, 1.241
Tim Waugh
twaugh at fedoraproject.org
Wed Mar 25 18:50:14 UTC 2009
- Previous message: rpms/qt/F-9 qt-4.5-sparc64.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-linguist-crash.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-lrelease.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-qdoc3.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-rc1-ppc64.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 qt-copy-patches-svn_checkout.sh, 1.3, 1.4 qt.spec, 1.193, 1.194 sources, 1.42, 1.43 qt-x11-opensource-src-4.4.0-qgtkstyle.patch, 1.1, NONE qt-x11-opensource-src-4.4.3-im.patch, 1.1, NONE
- Next message: rpms/kmplayer/devel kmplayer-0.11.0a-fix_docs.patch, NONE, 1.1 kmplayer.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9187
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-monitor-traceback.patch
Log Message:
* Wed Mar 25 2009 Tim Waugh <twaugh at redhat.com> 1.0.16-2
- Prevent traceback in monitor when connection failed
(Ubuntu #343387).
system-config-printer-monitor-traceback.patch:
--- NEW FILE system-config-printer-monitor-traceback.patch ---
diff -U0 system-config-printer-1.0.16/ChangeLog.monitor-traceback system-config-printer-1.0.16/ChangeLog
--- system-config-printer-1.0.16/ChangeLog.monitor-traceback 2009-03-13 17:08:52.000000000 +0000
+++ system-config-printer-1.0.16/ChangeLog 2009-03-25 18:43:21.000000000 +0000
@@ -0,0 +1,5 @@
+2009-03-16 Tim Waugh <twaugh at redhat.com>
+
+ * monitor.py (Monitor.__init__): Initialise update_timer to
+ prevent tracebacks if the connection fails (Ubuntu #343387).
+
diff -up system-config-printer-1.0.16/monitor.py.monitor-traceback system-config-printer-1.0.16/monitor.py
--- system-config-printer-1.0.16/monitor.py.monitor-traceback 2009-03-13 17:08:52.000000000 +0000
+++ system-config-printer-1.0.16/monitor.py 2009-03-25 18:43:21.000000000 +0000
@@ -149,6 +149,7 @@ class Monitor:
self.still_connecting = set()
self.connecting_to_device = {}
self.received_any_dbus_signals = False
+ self.update_timer = None
if bus == None:
try:
@@ -340,7 +341,9 @@ class Monitor:
def get_notifications(self):
if not self.process_pending_events:
# Defer the timer callback.
- gobject.source_remove (self.update_timer)
+ if self.update_timer:
+ gobject.source_remove (self.update_timer)
+
self.update_timer = gobject.timeout_add (200,
self.get_notifications)
return False
@@ -502,7 +505,9 @@ class Monitor:
# Update again when we're told to. If we're getting CUPS
# D-Bus signals, however, rely on those instead.
if not self.received_any_dbus_signals:
- gobject.source_remove (self.update_timer)
+ if self.update_timer:
+ gobject.source_remove (self.update_timer)
+
interval = 1000 * notifications['notify-get-interval']
self.update_timer = gobject.timeout_add (interval,
self.get_notifications)
@@ -539,7 +544,9 @@ class Monitor:
except cups.IPPError, (e, m):
self.watcher.cups_ipp_error (self, e, m)
- gobject.source_remove (self.update_timer)
+ if self.update_timer:
+ gobject.source_remove (self.update_timer)
+
debugprint ("Canceled subscription %d" % self.sub_id)
try:
@@ -752,7 +759,9 @@ class Monitor:
self.check_state_reasons (my_printers, printer_jobs)
def handle_dbus_signal(self, *args):
- gobject.source_remove (self.update_timer)
+ if self.update_timer:
+ gobject.source_remove (self.update_timer)
+
self.update_timer = gobject.timeout_add (200, self.get_notifications)
if not self.received_any_dbus_signals:
self.received_any_dbus_signals = True
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- system-config-printer.spec 13 Mar 2009 18:26:53 -0000 1.240
+++ system-config-printer.spec 25 Mar 2009 18:49:43 -0000 1.241
@@ -7,13 +7,14 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.0.16
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
Source0: http://cyberelk.net/tim/data/system-config-printer/1.0.x/system-config-printer-%{version}.tar.bz2
Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
+Patch1: system-config-printer-monitor-traceback.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -60,6 +61,7 @@
%prep
%setup -q -a 1 -a 2
+%patch1 -p1 -b .monitor-traceback
%build
%configure
@@ -149,6 +151,10 @@
exit 0
%changelog
+* Wed Mar 25 2009 Tim Waugh <twaugh at redhat.com> 1.0.16-2
+- Prevent traceback in monitor when connection failed
+ (Ubuntu #343387).
+
* Fri Mar 13 2009 Tim Waugh <twaugh at redhat.com> 1.0.16-1
- Updated to 1.0.16:
- Better PPD fallback searching.
- Previous message: rpms/qt/F-9 qt-4.5-sparc64.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-linguist-crash.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-lrelease.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-qdoc3.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-rc1-ppc64.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 qt-copy-patches-svn_checkout.sh, 1.3, 1.4 qt.spec, 1.193, 1.194 sources, 1.42, 1.43 qt-x11-opensource-src-4.4.0-qgtkstyle.patch, 1.1, NONE qt-x11-opensource-src-4.4.3-im.patch, 1.1, NONE
- Next message: rpms/kmplayer/devel kmplayer-0.11.0a-fix_docs.patch, NONE, 1.1 kmplayer.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list