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

2028697 - hp-setup trackbacks when hplip-gui RPM is not installed

Browse Source
This commit is contained in:
Zdenek Dohnal 2021-12-03 08:30:44 +01:00
parent d6bd8532ea
commit 7153ae8af4
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hplip-fedora-gui.patch
View File

@ -5,7 +5,7 @@ index d493b54..401dc41 100644
@@ -727,8 +727,8 @@ def canEnterGUIMode4(): # qt4 @@ -727,8 +727,8 @@ def canEnterGUIMode4(): # qt4
except ImportError: except ImportError:
try: try:
import ui5 import ui5.setupdialog
- except ImportError as e: - except ImportError as e:
- log.warn(e) - log.warn(e)
+ except ImportError: + except ImportError:
@ -22,7 +22,7 @@ index d493b54..401dc41 100644
log.error("PyQt not installed. GUI not available. Exiting.") log.error("PyQt not installed. GUI not available. Exiting.")
@@ -800,6 +801,7 @@ def checkPyQtImport4(): @@ -800,6 +801,7 @@ def checkPyQtImport4():
import ui5 import ui5.setupdialog
except ImportError: except ImportError:
log.debug('GUI not available.') log.debug('GUI not available.')
+ log.error('hplip-gui not installed. GUI not available.') + log.error('hplip-gui not installed. GUI not available.')

4
hplip-ui-optional.patch
View File

@ -27,7 +27,7 @@ index 98437a3..9b8813b 100644
+ import ui4 + import ui4
+ except ImportError: + except ImportError:
+ try: + try:
+ import ui5 + import ui5.setupdialog
+ except ImportError as e: + except ImportError as e:
+ log.warn(e) + log.warn(e)
+ return False + return False
@ -58,7 +58,7 @@ index 98437a3..9b8813b 100644
- return False - return False
+ try: + try:
+ import PyQt5 + import PyQt5
+ import ui5 + import ui5.setupdialog
+ except ImportError: + except ImportError:
+ log.debug('GUI not available.') + log.debug('GUI not available.')
+ return False + return False

5
hplip.spec
View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.21.2 Version: 3.21.2
Release: 14%{?dist} Release: 15%{?dist}
License: GPLv2+ and MIT and BSD and IJG and GPLv2+ with exceptions and ISC License: GPLv2+ and MIT and BSD and IJG and GPLv2+ with exceptions and ISC
Url: https://developers.hp.com/hp-linux-imaging-and-printing Url: https://developers.hp.com/hp-linux-imaging-and-printing
@ -871,6 +871,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
%changelog %changelog
* Fri Dec 03 2021 Zdenek Dohnal <zdohnal@redhat.com> - 3.21.2-15
- 2028697 - hp-setup trackbacks when hplip-gui RPM is not installed
* Tue Nov 23 2021 Zdenek Dohnal <zdohnal@redhat.com> - 3.21.2-14 * Tue Nov 23 2021 Zdenek Dohnal <zdohnal@redhat.com> - 3.21.2-14
- 2025853 - hplip: double "and" in license - 2025853 - hplip: double "and" in license