Attachment 50092 Details for Bug 117362

[patch] a fix for this bug

01-bnc-117362-bad-permissions-on-directories.patch (text/plain), 3.53 KB, created by Jon Trowbridge on 2005-09-15 21:43:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Trowbridge

Created: 2005-09-15 21:43:14 UTC

Size: 3.53 KB

patch

obsolete

>Index: beagled/FileSystemQueryable/DirectoryModel.cs
>===================================================================
>RCS file: /cvs/gnome/beagle/beagled/FileSystemQueryable/DirectoryModel.cs,v
>retrieving revision 1.5
>diff -u -p -r1.5 DirectoryModel.cs
>--- beagled/FileSystemQueryable/DirectoryModel.cs	12 Aug 2005 20:16:25 -0000	1.5
>+++ beagled/FileSystemQueryable/DirectoryModel.cs	15 Sep 2005 21:37:05 -0000
>@@ -172,7 +172,10 @@ namespace Beagle.Daemon.FileSystemQuerya
> 		}
> 
> 		public bool NeedsCrawl {
>-			get { return state != DirectoryState.Clean; }
>+			get {
>+				return state != DirectoryState.Clean
>+					&& state != DirectoryState.Uncrawlable;
>+			}
> 		}
> 
> 		public object WatchHandle {
>@@ -212,6 +215,11 @@ namespace Beagle.Daemon.FileSystemQuerya
> 				state = DirectoryState.PossiblyClean;
> 			else
> 				state = DirectoryState.Clean;
>+		}
>+
>+		public void MarkAsUncrawlable ()
>+		{
>+			state = DirectoryState.Uncrawlable;
> 		}
> 
> 		///////////////////////////////////////////////////////////
>Index: beagled/FileSystemQueryable/DirectoryState.cs
>===================================================================
>RCS file: /cvs/gnome/beagle/beagled/FileSystemQueryable/DirectoryState.cs,v
>retrieving revision 1.2
>diff -u -p -r1.2 DirectoryState.cs
>--- beagled/FileSystemQueryable/DirectoryState.cs	10 Aug 2005 19:22:41 -0000	1.2
>+++ beagled/FileSystemQueryable/DirectoryState.cs	15 Sep 2005 21:37:05 -0000
>@@ -42,6 +42,10 @@ namespace Beagle.Daemon.FileSystemQuerya
> 
> 		// Something definitely has changed.
> 		Dirty         = 3,
>+
>+		// Something is wrong: probably funky permissions.
>+		// Never try to crawl a directory in this state.
>+		Uncrawlable   = 4
> 	}
> 
> }
>Index: beagled/FileSystemQueryable/FileCrawlTask.cs
>===================================================================
>RCS file: /cvs/gnome/beagle/beagled/FileSystemQueryable/FileCrawlTask.cs,v
>retrieving revision 1.5
>diff -u -p -r1.5 FileCrawlTask.cs
>--- beagled/FileSystemQueryable/FileCrawlTask.cs	2 Sep 2005 18:09:22 -0000	1.5
>+++ beagled/FileSystemQueryable/FileCrawlTask.cs	15 Sep 2005 21:37:05 -0000
>@@ -103,9 +103,9 @@ namespace Beagle.Daemon.FileSystemQuerya
> 				Logger.Log.Debug ("Couldn't crawl '{0}'", current_dir.FullName);
> 
> 				// FIXME: If our attempt to crawl the directory fails, just
>-				// mark it as clean and move on.  This isn't optimal behavior,
>+				// mark it as uncrawlable and move on.  This isn't optimal behavior,
> 				// but works around bugs involving weird permissions for now.
>-				queryable.DoneCrawlingOneDirectory (current_dir);
>+				current_dir.MarkAsUncrawlable ();
> 				current_dir = null;
> 			}
> 			
>Index: beagled/FileSystemQueryable/FileSystemQueryable.cs
>===================================================================
>RCS file: /cvs/gnome/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs,v
>retrieving revision 1.86
>diff -u -p -r1.86 FileSystemQueryable.cs
>--- beagled/FileSystemQueryable/FileSystemQueryable.cs	11 Sep 2005 21:58:11 -0000	1.86
>+++ beagled/FileSystemQueryable/FileSystemQueryable.cs	15 Sep 2005 21:37:05 -0000
>@@ -712,6 +712,21 @@ namespace Beagle.Daemon.FileSystemQuerya
> 			dir.MarkAsClean ();
> 		}
> 
>+		public void MarkDirectoryAsUncrawlable (DirectoryModel dir)
>+		{
>+			if (! dir.IsAttached)
>+				return;
>+			
>+			// If we managed to get set up a watch on this directory,
>+			// drop it.
>+			if (dir.WatchHandle != null) {
>+				event_backend.ForgetWatch (dir.WatchHandle);
>+				dir.WatchHandle = null;
>+			}
>+
>+			dir.MarkAsUncrawlable ();
>+		}
>+
> 		public void Recrawl (string path) 
> 		{
> 			// Try to find a directory model for the path specified

Actions: View | Diff

Attachments on bug 117362: 50092