[mojosetup] [13/13] Always install the destination directory otherwise it is not uninstalled after an upgrade.

Francois Gouget fgouget at codeweavers.com
Mon May 21 14:42:01 EDT 2012


Note that even so it will be preserved if it is not empty.
---
 scripts/mojosetup_mainline.lua |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/mojosetup_mainline.lua b/scripts/mojosetup_mainline.lua
index 21585d1..d601d44 100644
--- a/scripts/mojosetup_mainline.lua
+++ b/scripts/mojosetup_mainline.lua
@@ -1624,11 +1624,10 @@ local function do_install(install)
             end
         end
 
-        -- Make sure we install the destination dir, so it's in the manifest.
-        if not MojoSetup.platform.exists(MojoSetup.destination) then
-            install_parent_dirs(MojoSetup.destination, MojoSetup.metadatakey)
-            install_directory(MojoSetup.destination, nil, MojoSetup.metadatakey)
-        end
+        -- Make sure we install the destination dir, so it's in the manifest
+        -- and thus gets uninstalled.
+        install_parent_dirs(MojoSetup.destination, MojoSetup.metadatakey)
+        install_directory(MojoSetup.destination, nil, MojoSetup.metadatakey)
 
         local function process_file(option, file)
             -- !!! FIXME: what happens if a file shows up in multiple options?
-- 
1.7.10


More information about the mojosetup mailing list