From 5c95f60129a69d5c84be5e32ae2bc6be27f46388 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Wed, 22 Jun 2016 11:13:05 +0200
Subject: [PATCH] 1341304 - name 'source_option' is not defined

---
 hplip-3165-sourceoption.patch | 11 +++++++++++
 hplip.spec                    |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 hplip-3165-sourceoption.patch

diff --git a/hplip-3165-sourceoption.patch b/hplip-3165-sourceoption.patch
new file mode 100644
index 0000000..fd8ff09
--- /dev/null
+++ b/hplip-3165-sourceoption.patch
@@ -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:
diff --git a/hplip.spec b/hplip.spec
index 68c65a0..9b04008 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -7,7 +7,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.16.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT and BSD
 
 Url: http://hplip.sourceforge.net/
@@ -36,6 +36,7 @@ Patch20: hplip-dj990c-margin.patch
 Patch21: hplip-strncpy.patch
 Patch22: hplip-no-write-bytecode.patch
 Patch23: hplip-silence-ioerror.patch
+Patch24: hplip-3165-sourceoption.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: python3-pillow
@@ -207,6 +208,9 @@ done
 # Ignore IOError when logging output (bug #712537).
 %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 \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -458,6 +462,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig
 
 %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
 - 3.16.5 (gui moves from Qt4 to Qt5)