- Display a warning when the wrong IEEE 1284 Device ID is detected.

This commit is contained in:
Tim Waugh 2010-02-21 19:05:37 +00:00
parent 3b0de025c8
commit 7efcc119f6
2 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,23 @@
diff -up system-config-printer-1.1.92/cupshelpers/ppds.py.device-ids-warning system-config-printer-1.1.92/cupshelpers/ppds.py
--- system-config-printer-1.1.92/cupshelpers/ppds.py.device-ids-warning 2010-01-27 11:17:44.000000000 +0000
+++ system-config-printer-1.1.92/cupshelpers/ppds.py 2010-02-21 18:27:20.767175951 +0000
@@ -2,7 +2,7 @@
## system-config-printer
-## Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc.
+## Copyright (C) 2006, 2007, 2008, 2009, 2010 Red Hat, Inc.
## Copyright (C) 2006 Florian Festi <ffesti@redhat.com>
## Copyright (C) 2006, 2007, 2008, 2009 Tim Waugh <twaugh@redhat.com>
@@ -561,6 +561,10 @@ class PPDs:
try:
ppdnamelist += self.ids["hp"][mdll]
status = self.STATUS_SUCCESS
+ print ("**** Incorrect IEEE 1284 Device ID: %s" %
+ self.ids["hp"][mdll])
+ print "**** Actual ID is MFG:%s;MDL:%s;" % (mfg, mdl)
+ print "**** Please report a bug against the HPLIP component"
id_matched = True
except KeyError:
pass

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.1.92 Version: 1.1.92
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
@ -17,6 +17,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-device-ids-warning.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4 BuildRequires: python-devel >= 2.4
@ -77,6 +78,7 @@ printers.
%setup -q -a 1 -a 2 %setup -q -a 1 -a 2
%patch1 -p1 -b .no-epydoc %patch1 -p1 -b .no-epydoc
%patch2 -p1 -b .lowercase-mfg-mdl %patch2 -p1 -b .lowercase-mfg-mdl
%patch3 -p1 -b .device-ids-warning
%build %build
%configure --with-udev-rules --with-polkit-1 %configure --with-udev-rules --with-polkit-1
@ -192,6 +194,9 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Sun Feb 21 2010 Tim Waugh <twaugh@redhat.com> - 1.1.92-2
- Display a warning when the wrong IEEE 1284 Device ID is detected.
* Fri Feb 19 2010 Tim Waugh <twaugh@redhat.com> - 1.1.92-1 * Fri Feb 19 2010 Tim Waugh <twaugh@redhat.com> - 1.1.92-1
- 1.1.92. - 1.1.92.