Allow the uninstallation to proceed if we cannot delete every file ex…

…actly.
icculus · Jun 10, 2010 · f3b6661 · f3b6661
1 parent 8ab059c
commit f3b6661
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/docs.txt b/docs.txt
@@ -330,6 +330,13 @@ Here are the elements, and the attributes they can possess.
     will be replaced with the installation destination.
 
 
+   delete_error_is_fatal (default true, mustBeTrue)
+
+    If we cannot exactly delete every file during uninstallation, we will
+    terminate at the very first failure if this is true.  Otherwise, we
+    will delete every file we can.
+
+
    updateurl (no default, mustBeUrl)
 
     This is written to the manifest files for the aid of external tools, but

diff --git a/scripts/mojosetup_init.lua b/scripts/mojosetup_init.lua
@@ -318,7 +318,8 @@ function Setup.Package(tab)
         { "support_uninstall", true, mustBeBool },
         { "preuninstall", nil, mustBeFunction },
         { "postuninstall", nil, mustBeFunction },
-        { "postexec", nil, mustBeString}
+        { "postexec", nil, mustBeString},
+        { "delete_error_is_fatal", true, mustBeBool}
     })
 
     if MojoSetup.installs == nil then

diff --git a/scripts/mojosetup_mainline.lua b/scripts/mojosetup_mainline.lua
@@ -155,6 +155,8 @@ local function do_delete(fname)
             retval = true
         elseif not MojoSetup.platform.exists(fname) then
             retval = true
+        else
+            MojoSetup.logerror("Deleting '" .. fname .. "'" .. " failed!")
         end
     end
     return retval
@@ -2059,7 +2061,7 @@ local function uninstaller()
         end
 
         local filelist = flatten_manifest(package.manifest, prepend_dest_dir)
-        delete_files(filelist, callback, true)
+        delete_files(filelist, callback, package.delete_error_is_fatal)
         run_config_defined_hook(package.postuninstall, package)
         MojoSetup.gui.final(_("Uninstall complete"))
         stop_gui()