Changeset 1663

Timestamp:

1/25/2010 3:05:50 AM (3 years ago)

Author:

lowjoel

Message:

Backport from Trunk: Fixed regression in r1102: the check on Exists ensures that the DirectoryNotFoundException? will not be raised -- however, it doesn't guard against UnauthorizedAccessException?, so we should be guarding against that instead.

Location:

branches/eraser6/6.0

Files:

• . (modified) (1 prop)
• Eraser.Manager/Task.cs (modified) (1 diff)

branches/eraser6/6.0/Eraser.Manager/Task.cs

@@ -672 +672 @@
             if (info.Exists)
             {
-                foreach (DirectoryInfo dir in info.GetDirectories())
-                    try
-                    {
+                try
+                {
+                    foreach (DirectoryInfo dir in info.GetDirectories())
                         result.AddRange(GetFiles(dir));
-                    }
-                    catch (DirectoryNotFoundException e)
-                    {
-                        //Ignore, but log.
-                        Task.Log.LastSessionEntries.Add(new LogEntry(S._("Could not erase {0} because {1}",
-                            dir.FullName, e.Message), LogLevel.Error));
-                    }
-
-                if (IncludeMask.Length == 0)
-                    result.AddRange(info.GetFiles());
-                else
-                    result.AddRange(info.GetFiles(IncludeMask, SearchOption.TopDirectoryOnly));
+
+                    if (IncludeMask.Length == 0)
+                        result.AddRange(info.GetFiles());
+                    else
+                        result.AddRange(info.GetFiles(IncludeMask, SearchOption.TopDirectoryOnly));
+                }
+                catch (UnauthorizedAccessException e)
+                {
+                    Task.Log.LastSessionEntries.Add(new LogEntry(S._("Could not erase files and " +
+                        "subfolders in {0} because {1}", info.FullName, e.Message), LogLevel.Error));
+                }
             }