rpms/system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- check-device-ids: search harder for missing Device IDs.

Browse Source
This commit is contained in:
Tim Waugh 2010-03-25 16:33:49 +00:00
parent 8b21dbb50f
commit 5c55ae5b79
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
system-config-printer-cdi-search-harder.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up system-config-printer-1.2.0/check-device-ids.py.cdi-search-harder system-config-printer-1.2.0/check-device-ids.py
--- system-config-printer-1.2.0/check-device-ids.py.cdi-search-harder 2010-03-25 16:33:07.312234926 +0000
+++ system-config-printer-1.2.0/check-device-ids.py 2010-03-25 16:33:07.409361225 +0000
@@ -195,6 +195,7 @@ for device, attrs in devices.iteritems (
print "%s (No drivers)" % more
(mfr, mdl) = ppdMakeModelSplit (make_and_model)
+ matches = set (ppds.getInfoFromModel (mfr, mdl))
mfrl = mfr.lower ()
mdls = None
for make in makes:
@@ -204,9 +205,10 @@ for device, attrs in devices.iteritems (
if mdls:
(s, bestmatches) = ppds._findBestMatchPPDs (mdls, id_fields['MDL'])
if s == ppds.STATUS_SUCCESS:
- missing = set (bestmatches) - set (drivers)
- for each in missing:
- print "%s MISSING %s [%s]" % (more, each,
- driver_uri_to_pkg (each))
+ matches += set (bestmatches)
+
+ missing = set (matches) - set (drivers)
+ for each in missing:
+ print "%s MISSING %s" % (more, each)
i += 1

5
system-config-printer.spec
View File

@ -27,6 +27,7 @@ Patch7: system-config-printer-reconnect-error.patch
Patch8: system-config-printer-downloadable-drivers.patch
Patch9: system-config-printer-JobCancel.patch
Patch10: system-config-printer-inklevel.patch
Patch11: system-config-printer-cdi-search-harder.patch
Patch100: system-config-printer-pycups-build.patch
@ -118,6 +119,9 @@ printers.
# Make inklevel widget easier to read (bug #576930).
%patch10 -p1 -b .inklevel
# check-device-ids: search harder for missing Device IDs.
%patch11 -p1 -b .cdi-search-harder
pushd pycups-%{pycups_version}
# Fixed pycups build with new distutils.
@ -241,6 +245,7 @@ exit 0
%changelog
* Thu Mar 25 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-8
- check-device-ids: search harder for missing Device IDs.
- Make inklevel widget easier to read (bug #576930).
* Wed Mar 24 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-7