rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Make 'hp-check' check for hpaio set-up correctly (bug #683007).

Browse Source 
Resolves: rhbz#683007
This commit is contained in:
Tim Waugh 2012-11-22 13:34:59 +00:00
parent 72bb35ccab
commit 626402d025
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hplip-check.patch Normal file
View File

@ -0,0 +1,41 @@
diff -up hplip-3.12.10a/check.py.check hplip-3.12.10a/check.py
diff -up hplip-3.12.10a/installer/core_install.py.check hplip-3.12.10a/installer/core_install.py
--- hplip-3.12.10a/installer/core_install.py.check 2012-11-22 13:22:58.527444444 +0000
+++ hplip-3.12.10a/installer/core_install.py 2012-11-22 13:27:11.319338942 +0000
@@ -1153,18 +1153,24 @@ class CoreInstall(object):
def check_hpaio(self):
found = False
- log.debug("'Checking for hpaio' in '/etc/sane.d/dll.conf'...")
- try:
- f = file('/etc/sane.d/dll.conf', 'r')
- except IOError:
- log.error("'/etc/sane.d/dll.conf' not found. Is SANE installed?")
- else:
- for line in f:
- lineNoSpace = re.sub(r'\s', '', line)
- hpaiomatched=re.match('hpaio',lineNoSpace)
- if hpaiomatched:
- found = True
- break
+ for path in ['/etc/sane.d/dll.conf',
+ '/etc/sane.d/dll.d/hpaio']:
+ log.debug("'Checking for hpaio' in '%s'..." % path)
+ try:
+ f = file(path, 'r')
+ except IOError:
+ log.error("'%s' not found. Is SANE installed?" % path)
+ else:
+ for line in f:
+ lineNoSpace = re.sub(r'\s', '', line)
+ hpaiomatched=re.match('hpaio',lineNoSpace)
+ if hpaiomatched:
+ found = True
+ break
+
+ if found:
+ break
+
return found
def update_hpaio(self):

9
hplip.spec
View File

@ -3,7 +3,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.12.10 Version: 3.12.10
Release: 4.%{posttag}%{?dist} Release: 5.%{posttag}%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
@ -43,6 +43,7 @@ Patch29: hplip-makefile-chgrp.patch
Patch30: hplip-hpaio-localonly.patch Patch30: hplip-hpaio-localonly.patch
Patch31: hplip-ipp-accessors.patch Patch31: hplip-ipp-accessors.patch
Patch32: hplip-IEEE-1284-4.patch Patch32: hplip-IEEE-1284-4.patch
Patch33: hplip-check.patch
Requires(pre): /sbin/service Requires(pre): /sbin/service
Requires(post): /sbin/chkconfig Requires(post): /sbin/chkconfig
@ -301,6 +302,9 @@ done
# Support IEEE 1284.4 protocol over USB (bug #858861). # Support IEEE 1284.4 protocol over USB (bug #858861).
%patch32 -p1 -b .hplip-IEEE-1284-4 %patch32 -p1 -b .hplip-IEEE-1284-4
# Various adjustments to make 'hp-check' run more smoothly (bug #683007).
%patch33 -p1 -b .check
sed -i.duplex-constraints \ sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in prnt/drv/hpcups.drv.in
@ -530,6 +534,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Thu Nov 22 2012 Tim Waugh <twaugh@redhat.com> 3.12.10-5.a
- Make 'hp-check' check for hpaio set-up correctly (bug #683007).
* Wed Oct 17 2012 Tim Waugh <twaugh@redhat.com> 3.12.10-4.a * Wed Oct 17 2012 Tim Waugh <twaugh@redhat.com> 3.12.10-4.a
- Some more CUPS filters using the wrong temporary directory - Some more CUPS filters using the wrong temporary directory
(bug #865603). (bug #865603).