Try unlink(), and check exists() after if it fails.

This should handle broken symlinks better than checking exists() first before attempting to unlink(). Fixes Bugzilla #3941, I think.
icculus · Feb 5, 2009 · 76640fa · 76640fa
1 parent 85e25a0
commit 76640fa
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/scripts/mojosetup_mainline.lua b/scripts/mojosetup_mainline.lua
@@ -148,11 +148,13 @@ local function do_delete(fname)
     if fname == nil then
         retval = true
     else
-        if not MojoSetup.platform.exists(fname) then
-            retval = true
-        elseif MojoSetup.platform.unlink(fname) then
+        -- Try to unlink() first, so we'll catch broken symlinks, then try
+        --  exists(): if it really wasn't there, we'll call it success anyhow.
+        if MojoSetup.platform.unlink(fname) then
             MojoSetup.loginfo("Deleted '" .. fname .. "'")
             retval = true
+        elseif not MojoSetup.platform.exists(fname) then
+            retval = true
         end
     end
     return retval