rpms/system-config-printer/devel system-config-printer-troubleshooter-debugcancel.patch, NONE, 1.1 system-config-printer.spec, 1.321, 1.322

[Jiří Popelka]

Author: jpopelka

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-troubleshooter-debugcancel.patch 
Log Message:
* Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-8
- Prevent traceback when cancel button in troubleshooter pressed (#546821).


system-config-printer-troubleshooter-debugcancel.patch:
 ErrorLogCheckpoint.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-troubleshooter-debugcancel.patch ---
diff -up system-config-printer-1.1.15/troubleshoot/ErrorLogCheckpoint.py.debugcancel system-config-printer-1.1.15/troubleshoot/ErrorLogCheckpoint.py
--- system-config-printer-1.1.15/troubleshoot/ErrorLogCheckpoint.py.debugcancel	2009-09-01 13:08:33.000000000 +0200
+++ system-config-printer-1.1.15/troubleshoot/ErrorLogCheckpoint.py	2009-12-14 17:16:32.000000000 +0100
@@ -23,7 +23,7 @@ import cups
 import os
 import tempfile
 import time
-from timedops import TimedOperation
+from timedops import TimedOperation, OperationCanceled
 from base import *
 class ErrorLogCheckpoint(Question):
     def __init__ (self, troubleshooter):
@@ -162,7 +162,7 @@ class ErrorLogCheckpoint(Question):
             self.op = TimedOperation (self.authconn.adminGetServerSettings,
                                       parent=parent)
             settings = self.op.run ()
-        except cups.IPPError:
+        except (cups.IPPError, OperationCanceled):
             self.troubleshooter.ready ()
             self.forward_allowed = True
             handler (button)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- system-config-printer.spec	9 Dec 2009 10:57:04 -0000	1.321
+++ system-config-printer.spec	14 Dec 2009 17:10:11 -0000	1.322
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -22,6 +22,7 @@ Patch4: system-config-printer-cupsd.conf
 Patch5: system-config-printer-troubleshooter-traceback.patch
 Patch6: system-config-printer-lpd-uri.patch
 Patch7: system-config-printer-short-lived-states.patch
+Patch8: system-config-printer-troubleshooter-debugcancel.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -88,6 +89,7 @@ printers.
 %patch5 -p1 -b .troubleshooter-traceback
 %patch6 -p1 -b .lpd-uri
 %patch7 -p1 -b .short-lived-states
+%patch8 -p1 -b .troubleshooter-debugcancel
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -200,6 +202,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.15-8
+- Prevent traceback when cancel button in troubleshooter pressed (#546821).
+
 * Wed Dec  9 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-7
 - Fixed jobviewer traceback with short-lived state reasons (bug #545733).