- Fixed traceback in check-driver-ids.py when no drivers are found (bug

#574827).
This commit is contained in:
Tim Waugh 2010-03-18 17:15:41 +00:00
parent d8e6b313f2
commit 25820ee4cd
2 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up system-config-printer-1.2.0/check-device-ids.py.cdi-no-drivers system-config-printer-1.2.0/check-device-ids.py
--- system-config-printer-1.2.0/check-device-ids.py.cdi-no-drivers 2010-03-17 14:20:35.000000000 +0000
+++ system-config-printer-1.2.0/check-device-ids.py 2010-03-18 16:29:56.065865306 +0000
@@ -167,7 +167,7 @@ for device, attrs in devices.iteritems (
try:
drivers = ppds.ids[id_fields['MFG'].lower ()][id_fields['MDL'].lower ()]
except KeyError:
- drivers = None
+ drivers = []
if i < n:
more = unichr (0x2502)

View File

@ -7,7 +7,7 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.2.0 Version: 1.2.0
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/ URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base Group: System Environment/Base
@ -19,6 +19,7 @@ Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
Patch1: system-config-printer-no-epydoc.patch Patch1: system-config-printer-no-epydoc.patch
Patch2: system-config-printer-lowercase-mfg-mdl.patch Patch2: system-config-printer-lowercase-mfg-mdl.patch
Patch3: system-config-printer-cdi-no-drivers.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4 BuildRequires: python-devel >= 2.4
@ -83,6 +84,10 @@ printers.
# Convert InstallPrinterDriver requests to lower-case. # Convert InstallPrinterDriver requests to lower-case.
%patch2 -p1 -b .lowercase-mfg-mdl %patch2 -p1 -b .lowercase-mfg-mdl
# Fixed traceback in check-driver-ids.py when no drivers are found
# (bug #574827).
%patch3 -p1 -b .cdi-no-drivers
%build %build
%configure --with-udev-rules %configure --with-udev-rules
@ -198,6 +203,10 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Thu Mar 18 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-2
- Fixed traceback in check-driver-ids.py when no drivers are found
(bug #574827).
* Wed Mar 17 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-1 * Wed Mar 17 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-1
- Updated to pycups-1.9.49. - Updated to pycups-1.9.49.
- 1.2.0: - 1.2.0: