[guake] Add patch fixing RHBZ#815996
Pierre-YvesChibon
pingou at fedoraproject.org
Wed Aug 1 20:35:37 UTC 2012
commit 5ade8a8906830eb6b5a06ce325f38641e7cb0909
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Wed Aug 1 22:34:33 2012 +0200
Add patch fixing RHBZ#815996
0001-Let-allow-the-signal.SIGTERM-to-fail.patch | 31 +++++++++++++++++++++++
guake.spec | 7 ++++-
2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/0001-Let-allow-the-signal.SIGTERM-to-fail.patch b/0001-Let-allow-the-signal.SIGTERM-to-fail.patch
new file mode 100644
index 0000000..e6c4567
--- /dev/null
+++ b/0001-Let-allow-the-signal.SIGTERM-to-fail.patch
@@ -0,0 +1,31 @@
+From d9c55e9192e8fbd5c84b6a7bfbf28ed88e119717 Mon Sep 17 00:00:00 2001
+From: Pierre-Yves Chibon <pingou at pingoured.fr>
+Date: Wed, 1 Aug 2012 22:30:12 +0200
+Subject: [PATCH] Let allow the signal.SIGTERM to fail
+
+If os.kill(pid, signal.SIGTERM) fails, currently guake fails as well
+we should allow this command to fail withouth throwing an
+exception.
+---
+ src/guake | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/guake b/src/guake
+index 6d8f9c5..72ea56e 100644
+--- a/src/guake
++++ b/src/guake
+@@ -1259,7 +1259,10 @@ class Guake(SimpleGladeApp):
+ call this in another thread. This doesn't change any thing in
+ UI, so you can use python's start_new_thread.
+ """
+- os.kill(pid, signal.SIGTERM)
++ try:
++ os.kill(pid, signal.SIGTERM)
++ except OSError:
++ pass
+ num_tries = 30
+
+ while num_tries > 0:
+--
+1.7.7.6
+
diff --git a/guake.spec b/guake.spec
index aff2190..b8ec08b 100644
--- a/guake.spec
+++ b/guake.spec
@@ -1,6 +1,6 @@
Name: guake
Version: 0.4.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Drop-down terminal for GNOME
Group: Applications/System
@@ -9,6 +9,7 @@ URL: http://www.guake.org/
Source0: http://guake.org/files/%{name}-%{version}.tar.gz
Patch0: 0001-Fix-focus-issue-on-gnome-shell.patch
Patch1: 0001-Fix-notification.patch
+Patch2: 0001-Let-allow-the-signal.SIGTERM-to-fail.patch
# Not used here -- official release --
#Source0: %{name}-%{version}.20090321git.tar.gz
@@ -45,6 +46,7 @@ sed -i -e "s|include <glib/gtypes.h>|include <glib.h>|" src/globalhotkeys/keybin
%patch0 -p1 -b .
%patch1 -p1 -b .
+%patch2 -p1 -b .
%build
%configure --disable-schemas-install --disable-static
@@ -102,6 +104,9 @@ killall -HUP gconfd-2 > /dev/null || :
%{_datadir}/icons/hicolor/*/apps/%{name}*.png
%changelog
+* Wed Aug 01 2012 Pierre-Yves Chibon <pingou at pingoured.fr> - 0.4.4-3
+- Add patch to allow os.kill(pid, signal.SIGTERM) to fails
+
* Fri Jul 27 2012 Pierre-Yves Chibon <pingou at pingoured.fr> - 0.4.4-2
- Re-add the fix notification patch
More information about the scm-commits
mailing list