- Avoid showing a non-fatal exception when adding an IPP printer (bug

#507629).
- Fixed traceback when adding/modifying printer which could lead to display
    bugs (bug #507489).
This commit is contained in:
Tim Waugh 2009-06-24 09:45:25 +00:00
parent edba444851
commit 9579a563c6
2 changed files with 17 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up system-config-printer-1.1.8/system-config-printer.py.ipp-nonfatal-exception system-config-printer-1.1.8/system-config-printer.py
--- system-config-printer-1.1.8/system-config-printer.py.ipp-nonfatal-exception 2009-06-24 10:28:47.773317435 +0100
+++ system-config-printer-1.1.8/system-config-printer.py 2009-06-24 10:29:24.339192122 +0100
@@ -4167,6 +4167,8 @@ class NewPrinterGUI(GtkGUI):
self.entNPDescription.set_text (info)
if len (location) > 0:
self.entNPLocation.set_text (location)
+ except RuntimeError:
+ pass
except:
nonfatalException ()

View File

@ -15,6 +15,7 @@ Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-pr
Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_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 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
Patch1: system-config-printer-bug507489.patch Patch1: system-config-printer-bug507489.patch
Patch2: system-config-printer-ipp-nonfatal-exception.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4 BuildRequires: python-devel >= 2.4
@ -65,6 +66,7 @@ the configuration tool.
%prep %prep
%setup -q -a 1 -a 2 %setup -q -a 1 -a 2
%patch1 -p1 -b .bug507489 %patch1 -p1 -b .bug507489
%patch2 -p1 -b .ipp-nonfatal-exception
%build %build
%configure %configure
@ -167,7 +169,9 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Tue Jun 23 2009 Tim Waugh <twaugh@redhat.com> 1.1.8-2 * Wed Jun 24 2009 Tim Waugh <twaugh@redhat.com> 1.1.8-2
- Avoid showing a non-fatal exception when adding an IPP printer
(bug #507629).
- Fixed traceback when adding/modifying printer which could lead to - Fixed traceback when adding/modifying printer which could lead to
display bugs (bug #507489). display bugs (bug #507489).