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

Fixed typo in systemtray.py (bug #991638).

Browse Source 
Resolves: rhbz#991638
This commit is contained in:
Tim Waugh 2013-08-05 15:54:13 +01:00
parent 2f4573df64
commit a5d4dfe5d4
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hplip-systray-dbus-exception.patch
View File

@ -1,14 +1,23 @@
diff -up hplip-3.12.11/ui4/systemtray.py.systray-dbus-exception hplip-3.12.11/ui4/systemtray.py
--- hplip-3.12.11/ui4/systemtray.py.systray-dbus-exception 2012-11-20 10:51:40.000000000 +0100
+++ hplip-3.12.11/ui4/systemtray.py 2012-11-27 10:08:51.333805871 +0100
@@ -802,7 +802,13 @@ def run(read_pipe):
diff -up hplip-3.13.7/ui4/systemtray.py.systray-dbus-exception hplip-3.13.7/ui4/systemtray.py
--- hplip-3.13.7/ui4/systemtray.py.systray-dbus-exception 2013-07-23 06:13:40.000000000 +0100
+++ hplip-3.13.7/ui4/systemtray.py 2013-08-05 15:52:44.904186798 +0100
@@ -466,7 +466,7 @@ class SystemTrayApp(QApplication):
try:
self.service = self.session_bus.get_object('com.hplip.StatusService',
"/com/hplip/StatusService")
- except DBusException:
+ except dbus.DBusException:
log.warn("Unable to connect to StatusService. Retrying...")
t += 1
@@ -820,7 +820,13 @@ def run(read_pipe):
log.set_module("hp-systray(qt4)")
log.debug("PID=%d" % os.getpid())
- app = SystemTrayApp(sys.argv, read_pipe)
+ try:
+ app = SystemTrayApp(sys.argv, read_pipe)
+ except DBusException, e:
+ except dbus.DBusException, e:
+ # No session bus
+ log.debug("Caught exception: %s" % e)
+ sys.exit(1)

5
hplip.spec
View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.13.8
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
@ -524,6 +524,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
* Mon Aug 5 2013 Tim Waugh <twaugh@redhat.com> - 3.13.8-2
- Fixed typo in systemtray.py (bug #991638).
* Tue Aug 13 2013 Jiri Popelka <jpopelka@redhat.com> - 3.13.8-1
- 3.13.8