Fixed typo in check-device-ids.py when looking for ID-less matches.

This commit is contained in:
Tim Waugh 2011-10-17 10:57:26 +01:00
parent 827232cdf3
commit b8e1eebab9
2 changed files with 17 additions and 0 deletions

View File

@ -0,0 +1,12 @@
diff -up system-config-printer-1.3.7/check-device-ids.py.ids system-config-printer-1.3.7/check-device-ids.py
--- system-config-printer-1.3.7/check-device-ids.py.ids 2011-09-26 16:39:20.000000000 +0100
+++ system-config-printer-1.3.7/check-device-ids.py 2011-10-17 10:56:45.937590097 +0100
@@ -301,7 +301,7 @@ for device, attrs in devices.iteritems (
break
if mdls:
(s, bestmatches) = ppds._findBestMatchPPDs (mdls, mdl)
- if s == ppds.STATUS_SUCCESS:
+ if s == ppds.FIT_EXACT:
matches = matches.union (set (bestmatches))
missing = set (matches) - set (drivers)

View File

@ -8,6 +8,7 @@ Group: System Environment/Base
Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz
Patch1: system-config-printer-no-applet-in-gnome.patch Patch1: system-config-printer-no-applet-in-gnome.patch
Patch2: system-config-printer-auth.patch Patch2: system-config-printer-auth.patch
Patch3: system-config-printer-ids.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: desktop-file-utils >= 0.2.92
BuildRequires: gettext-devel BuildRequires: gettext-devel
@ -76,6 +77,9 @@ printers.
# (Ubuntu #653132). # (Ubuntu #653132).
%patch2 -p1 -b .auth %patch2 -p1 -b .auth
# Fixed typo in check-device-ids.py when looking for ID-less matches.
%patch3 -p1 -b .ids
%build %build
%configure --with-udev-rules %configure --with-udev-rules
@ -203,6 +207,7 @@ fi
%changelog %changelog
* Mon Oct 17 2011 Tim Waugh <twaugh@redhat.com> 1.3.7-2 * Mon Oct 17 2011 Tim Waugh <twaugh@redhat.com> 1.3.7-2
- Fixed typo in check-device-ids.py when looking for ID-less matches.
- Handle new CUPS 1.5 IPP error response IPP_AUTHENTICATION_CANCELED - Handle new CUPS 1.5 IPP error response IPP_AUTHENTICATION_CANCELED
(Ubuntu #653132). (Ubuntu #653132).