1341304 - name 'source_option' is not defined
This commit is contained in:
parent
78217e937c
commit
5c95f60129
11
hplip-3165-sourceoption.patch
Normal file
11
hplip-3165-sourceoption.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -up hplip-3.16.5/scan.py.sourceoption hplip-3.16.5/scan.py
|
||||||
|
--- hplip-3.16.5/scan.py.sourceoption 2016-06-22 10:25:52.742799941 +0200
|
||||||
|
+++ hplip-3.16.5/scan.py 2016-06-22 10:34:51.945766487 +0200
|
||||||
|
@@ -658,6 +658,7 @@ try:
|
||||||
|
sys.exit(1)
|
||||||
|
except:
|
||||||
|
log.error("Failed to get the source from device.")
|
||||||
|
+ sys.exit(1)
|
||||||
|
|
||||||
|
#check if device has only ADF
|
||||||
|
if len(source_option) == 1 and 'ADF' in source_option:
|
@ -7,7 +7,7 @@
|
|||||||
Summary: HP Linux Imaging and Printing Project
|
Summary: HP Linux Imaging and Printing Project
|
||||||
Name: hplip
|
Name: hplip
|
||||||
Version: 3.16.5
|
Version: 3.16.5
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPLv2+ and MIT and BSD
|
License: GPLv2+ and MIT and BSD
|
||||||
|
|
||||||
Url: http://hplip.sourceforge.net/
|
Url: http://hplip.sourceforge.net/
|
||||||
@ -36,6 +36,7 @@ Patch20: hplip-dj990c-margin.patch
|
|||||||
Patch21: hplip-strncpy.patch
|
Patch21: hplip-strncpy.patch
|
||||||
Patch22: hplip-no-write-bytecode.patch
|
Patch22: hplip-no-write-bytecode.patch
|
||||||
Patch23: hplip-silence-ioerror.patch
|
Patch23: hplip-silence-ioerror.patch
|
||||||
|
Patch24: hplip-3165-sourceoption.patch
|
||||||
|
|
||||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
Requires: python3-pillow
|
Requires: python3-pillow
|
||||||
@ -207,6 +208,9 @@ done
|
|||||||
# Ignore IOError when logging output (bug #712537).
|
# Ignore IOError when logging output (bug #712537).
|
||||||
%patch23 -p1 -b .silence-ioerror
|
%patch23 -p1 -b .silence-ioerror
|
||||||
|
|
||||||
|
# [abrt] hplip: hp-scan:663:<module>:NameError: name 'source_option' is not defined (bug #1341304)
|
||||||
|
%patch24 -p1 -b .sourceoption
|
||||||
|
|
||||||
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
|
||||||
@ -458,6 +462,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
|||||||
%postun libs -p /sbin/ldconfig
|
%postun libs -p /sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 22 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.5-2
|
||||||
|
- bug 1341304 - name 'source_option' is not defined
|
||||||
|
|
||||||
* Thu May 19 2016 Jiri Popelka <jpopelka@redhat.com> - 3.16.5-1
|
* Thu May 19 2016 Jiri Popelka <jpopelka@redhat.com> - 3.16.5-1
|
||||||
- 3.16.5 (gui moves from Qt4 to Qt5)
|
- 3.16.5 (gui moves from Qt4 to Qt5)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user