beagle r4519 - in branches/beagle-lucene2_1/beagled/Lucene.Net: Store upstream-changes

[dbera svn gnome org]

Author: dbera
Date: Sat Feb 23 01:30:06 2008
New Revision: 4519
URL: http://svn.gnome.org/viewvc/beagle?rev=4519&view=rev

Log:
Add part of 28_nospace_exception.patch.


Added:
   branches/beagle-lucene2_1/beagled/Lucene.Net/upstream-changes/10_better-logging.patch
Modified:
   branches/beagle-lucene2_1/beagled/Lucene.Net/Store/Lock.cs

Modified: branches/beagle-lucene2_1/beagled/Lucene.Net/Store/Lock.cs
==============================================================================
--- branches/beagle-lucene2_1/beagled/Lucene.Net/Store/Lock.cs	(original)
+++ branches/beagle-lucene2_1/beagled/Lucene.Net/Store/Lock.cs	Sat Feb 23 01:30:06 2008
@@ -87,7 +87,9 @@
 						fs.Close ();
 						ex.Append (" -- pid ").Append (pid);
 
-						if (System.IO.Directory.Exists ("/proc/" + pid))
+						if (pid == String.Empty)
+							ex.Append ("(empty)");
+						else if (System.IO.Directory.Exists ("/proc/" + pid))
 							ex.Append (" -- process exists");
 						else
 							ex.Append (" -- process does not exist, stale lockfile?");

Added: branches/beagle-lucene2_1/beagled/Lucene.Net/upstream-changes/10_better-logging.patch
==============================================================================
--- (empty file)
+++ branches/beagle-lucene2_1/beagled/Lucene.Net/upstream-changes/10_better-logging.patch	Sat Feb 23 01:30:06 2008
@@ -0,0 +1,19 @@
+From: D Bera <dbera web gmail com>
+
+For some reason, the pid is sometimes empty but it is figure out in the log file.
+
+Index: Store/Lock.cs
+===================================================================
+--- Store/Lock.cs	(revision 4517)
++++ Store/Lock.cs	(working copy)
+@@ -87,7 +87,9 @@
+ 						fs.Close ();
+ 						ex.Append (" -- pid ").Append (pid);
+ 
+-						if (System.IO.Directory.Exists ("/proc/" + pid))
++						if (pid == String.Empty)
++							ex.Append ("(empty)");
++						else if (System.IO.Directory.Exists ("/proc/" + pid))
+ 							ex.Append (" -- process exists");
+ 						else
+ 							ex.Append (" -- process does not exist, stale lockfile?");