rpms/system-config-printer/F-11 system-config-printer-troubleshooter-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.311, 1.312
Tim Waugh
twaugh at fedoraproject.org
Mon Dec 7 15:00:39 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24293
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-troubleshooter-traceback.patch
Log Message:
* Mon Dec 7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-4
- Fixed traceback when troubleshooter operation is cancelled (bug #544356).
system-config-printer-troubleshooter-traceback.patch:
__init__.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- NEW FILE system-config-printer-troubleshooter-traceback.patch ---
diff -up system-config-printer-1.1.15/troubleshoot/__init__.py.troubleshooter-traceback system-config-printer-1.1.15/troubleshoot/__init__.py
--- system-config-printer-1.1.15/troubleshoot/__init__.py.troubleshooter-traceback 2009-09-30 09:35:12.000000000 +0100
+++ system-config-printer-1.1.15/troubleshoot/__init__.py 2009-12-07 14:58:33.260971786 +0000
@@ -178,6 +178,7 @@ class Troubleshooter:
return text.rstrip () + '\n'
def busy (self):
+ self._in_module_call = True
self.forward.set_sensitive (False)
self.back.set_sensitive (False)
gdkwin = self.get_window ().window
@@ -187,6 +188,7 @@ class Troubleshooter:
gtk.main_iteration ()
def ready (self):
+ self._in_module_call = False
gdkwin = self.get_window ().window
if gdkwin:
gdkwin.set_cursor (gtk.gdk.Cursor (gtk.gdk.LEFT_PTR))
@@ -291,13 +293,11 @@ class Troubleshooter:
def _display (self, question):
result = False
- self._in_module_call = True
try:
result = question.display ()
except:
self._report_traceback ()
- self._in_module_call = False
question.displayed = result
return result
@@ -310,13 +310,11 @@ class Troubleshooter:
def _collect_answer (self, question):
answer = {}
- self._in_module_call = True
try:
answer = question.collect_answer ()
except:
self._report_traceback ()
- self._in_module_call = False
return answer
QUESTIONS = ["Welcome",
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -p -r1.311 -r1.312
--- system-config-printer.spec 3 Dec 2009 17:21:46 -0000 1.311
+++ system-config-printer.spec 7 Dec 2009 15:00:39 -0000 1.312
@@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.1.15
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/py
Patch1: system-config-printer-localize-statereason.patch
Patch2: system-config-printer-browsepoll.patch
Patch3: system-config-printer-cupsd.conf-parser.patch
+Patch4: system-config-printer-troubleshooter-traceback.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -69,6 +70,7 @@ the configuration tool.
%patch1 -p1 -b .localize-statereason
%patch2 -p1 -b .browsepoll
%patch3 -p1 -b .cupsd.conf-parser
+%patch4 -p1 -b .troubleshooter-traceback
%build
%configure
@@ -171,6 +173,9 @@ rm -rf %buildroot
exit 0
%changelog
+* Mon Dec 7 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-4
+- Fixed traceback when troubleshooter operation is cancelled (bug #544356).
+
* Thu Dec 3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-3
- Fixed cupsd.conf parsing when lines begin with blanks (bug #544003).
- Don't overwrite BrowsePoll settings in basic settings dialog (bug #543986).
More information about the scm-commits
mailing list