Mailinglist Archive: opensuse-commit (1028 mails)

< Previous Next >
commit beagle
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 15 Jun 2006 15:05:31 +0200 (CEST)
  • Message-id: <20060615130531.B0B21572AB@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package beagle
checked in at Thu Jun 15 15:05:31 CEST 2006.

--------
--- GNOME/beagle/beagle.changes 2006-06-13 22:57:27.000000000 +0200
+++ beagle/beagle.changes 2006-06-15 00:18:27.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jun 15 00:04:58 CEST 2006 - joeshaw@xxxxxxx
+
+- Add a patch to use SafeProcess to start the index helper
+ process, which will automatically (and immediately) reap zombie
+ child processes. Fixes bnc #185069.
+
+-------------------------------------------------------------------

New:
----
beagle-index-helper-zombie.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ beagle.spec ++++++
--- /var/tmp/diff_new_pack.eDsaii/_old 2006-06-15 15:05:09.000000000 +0200
+++ /var/tmp/diff_new_pack.eDsaii/_new 2006-06-15 15:05:09.000000000 +0200
@@ -18,7 +18,7 @@
Group: Productivity/Other
Autoreqprov: on
Version: 0.2.3
-Release: 56
+Release: 57
Summary: Desktop Search Application
URL: http://www.gnome.org/projects/beagle/
Source: %{name}-%{version}.tar.gz
@@ -56,6 +56,7 @@
Patch29: beagle-zh_CN.patch
Patch30: beagle-search-resize.patch
Patch31: beagle-calendar-null-description-fix.patch
+Patch32: beagle-index-helper-zombie.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prereq: /usr/sbin/groupadd /usr/sbin/useradd
Requires: mono-core >= 1.1.13.5
@@ -328,6 +329,7 @@
%patch29
%patch30
%patch31
+%patch32

%build
rm po/no.*
@@ -485,6 +487,10 @@
%{prefix}/%_lib/pkgconfig/*.pc

%changelog -n beagle
+* Thu Jun 15 2006 - joeshaw@xxxxxxx
+- Add a patch to use SafeProcess to start the index helper
+ process, which will automatically (and immediately) reap zombie
+ child processes. Fixes bnc #185069.
* Tue Jun 13 2006 - sreeves@xxxxxxx
- Fix for 182999 - Change beagle settings name
* Mon Jun 12 2006 - joeshaw@xxxxxxx



++++++ beagle-index-helper-zombie.patch ++++++
Index: Util/SafeProcess.cs
===================================================================
RCS file: /cvs/gnome/beagle/Util/SafeProcess.cs,v
retrieving revision 1.3
diff -u -p -u -r1.3 SafeProcess.cs
--- Util/SafeProcess.cs 26 Apr 2006 19:19:51 -0000 1.3
+++ Util/SafeProcess.cs 14 Jun 2006 20:09:38 -0000
@@ -37,6 +37,7 @@ namespace Beagle.Util {
private bool redirect_stdin, redirect_stdout, redirect_stderr;
private string[] args;
private UnixStream stdin_stream, stdout_stream, stderr_stream;
+ private int pid;

public string[] Arguments {
get { return args; }
@@ -70,6 +71,10 @@ namespace Beagle.Util {
get { return stderr_stream; }
}

+ public int Id {
+ get { return pid; }
+ }
+
[DllImport ("libglib-2.0.so.0")]
static extern bool g_spawn_async_with_pipes (string working_directory,
string[] argv,
@@ -77,7 +82,7 @@ namespace Beagle.Util {
int flags,
IntPtr child_setup,
IntPtr child_data,
- IntPtr pid,
+ out int pid,
[In,Out] IntPtr standard_input,
[In,Out] IntPtr standard_output,
[In,Out] IntPtr standard_error,
@@ -111,7 +116,7 @@ namespace Beagle.Util {

g_spawn_async_with_pipes (null, args, null,
1 << 2, // G_SPAWN_SEARCH_PATH
- IntPtr.Zero, IntPtr.Zero, IntPtr.Zero,
+ IntPtr.Zero, IntPtr.Zero, out pid,
in_ptr, out_ptr, err_ptr, out error);

if (error != IntPtr.Zero)
Index: beagled/RemoteIndexer.cs
===================================================================
RCS file: /cvs/gnome/beagle/beagled/RemoteIndexer.cs,v
retrieving revision 1.35
diff -u -p -u -r1.35 RemoteIndexer.cs
--- beagled/RemoteIndexer.cs 14 Dec 2005 19:15:38 -0000 1.35
+++ beagled/RemoteIndexer.cs 14 Jun 2006 20:09:38 -0000
@@ -220,9 +220,8 @@ namespace Beagle.Daemon {

Logger.Log.Debug ("Launching helper process");

- Process p = new Process ();
- p.StartInfo.UseShellExecute = false;
- p.StartInfo.FileName = helper_path;
+ SafeProcess p = new SafeProcess ();
+ p.Arguments = new string [] { helper_path };
p.Start ();

Logger.Log.Debug ("IndexHelper PID is {0}", p.Id);


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit-help@xxxxxxxxxxxx

< Previous Next >