Changeset 2337

Timestamp:

10/30/2011 1:18:24 AM (7 months ago)

Author:

lowjoel

Message:

Supplants r2335: if we still cannot erase the file after 1 retry, throw a new SharingViolationException? with the program name locking the file. This will prevent the file from being deleted simplistically.

File:

• trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/FileSystemObjectErasureTarget.cs (modified) (2 diffs)

trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/FileSystemObjectErasureTarget.cs

@@ -281 +281 @@
                     "permissions prevent access to the file.", info.FullName), LogLevel.Error);
             }
+            catch (SharingViolationException e)
+            {
+                Logger.Log(e.Message, LogLevel.Error);
+            }
             finally
             {
@@ -357 +361 @@
                     }
 
-                    Logger.Log(S._("Could not force closure of file \"{0}\" {1}",
-                            info.FileName, S._("(locked by {0})",
-                                processStr.ToString().Remove(processStr.Length - 2)).Trim()),
-                        LogLevel.Error);
-                    throw;
+                    throw new SharingViolationException(S._(
+                        "Could not force closure of file \"{0}\" {1}", info.FileName,
+                        S._("(locked by {0})",
+                            processStr.ToString().Remove(processStr.Length - 2)).Trim()),
+                        info.FileName);
                 }
             }