Merge branch 'master' into luarocks-3

7 files changed, 39 insertions, 14 deletions

diff --git a/spec/install_spec.lua b/spec/install_spec.lua
index 8857e4bd..45b3e2f9 100644
--- a/spec/install_spec.lua
+++ b/spec/install_spec.lua
@@ -18,7 +18,9 @@ local extra_rocks = {
    "/lxsh-0.8.6-2.rockspec",
    "/say-1.2-1.src.rock",
    "/say-1.0-1.src.rock",
-   "/wsapi-1.6-1.src.rock"
+   "/wsapi-1.6-1.src.rock",
+   "/luafilesystem-1.6.3-2.src.rock",
+   "/luafilesystem-1.6.1-1.src.rock",
 }
 
 describe("LuaRocks install tests #blackbox #b_install", function()
@@ -81,6 +83,17 @@ describe("LuaRocks install tests #blackbox #b_install", function()
          end
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec"))
       end)
+
+      it('LuaRocks install - handle versioned modules when installing another version with --keep #268', function()
+         assert.is_true(run.luarocks_bool("install luafilesystem"))
+         assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION.."/lfs."..test_env.lib_extension))
+         assert.is_true(run.luarocks_bool("install luafilesystem 1.6.1 --keep"))
+         assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION.."/lfs."..test_env.lib_extension))
+         assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION.."/luafilesystem_1_6_1_1-lfs."..test_env.lib_extension))
+         assert.is_true(run.luarocks_bool("install luafilesystem"))
+         assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION.."/lfs."..test_env.lib_extension))
+         assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION.."/luafilesystem_1_6_1_1-lfs."..test_env.lib_extension))
+      end)
       
       it("LuaRocks install only-deps of luasocket packed rock", function()
          assert.is_true(run.luarocks_bool("build --pack-binary-rock luasocket 3.0rc1-2"))
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index d7d8ed07..c43ee949 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -225,7 +225,7 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
    end   
 
    if repos.is_installed(name, version) then
-      repos.delete_version(name, version)
+      repos.delete_version(name, version, deps_mode)
    end
 
    if not minimal_mode then
@@ -353,7 +353,7 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
    
    util.remove_scheduled_function(rollback)
    rollback = util.schedule_function(function()
-      repos.delete_version(name, version)
+      repos.delete_version(name, version, deps_mode)
    end)
 
    ok, err = repos.run_hook(rockspec, "post_install")
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index c4139fd0..6dded8ee 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -48,7 +48,7 @@ function install.install_binary_rock(rock_file, deps_mode)
       return nil, "Incompatible architecture "..arch, "arch"
    end
    if repos.is_installed(name, version) then
-      repos.delete_version(name, version)
+      repos.delete_version(name, version, deps_mode)
    end
    
    local rollback = util.schedule_function(function()
@@ -87,7 +87,7 @@ function install.install_binary_rock(rock_file, deps_mode)
 
    util.remove_scheduled_function(rollback)
    rollback = util.schedule_function(function()
-      repos.delete_version(name, version)
+      repos.delete_version(name, version, deps_mode)
    end)
 
    ok, err = repos.run_hook(rockspec, "post_install")
@@ -166,7 +166,7 @@ function install.command(flags, name, version)
          ok, err = install.install_binary_rock(name, deps.get_deps_mode(flags))
       end
       if not ok then return nil, err end
-      local name, version = ok, err
+      name, version = ok, err
       if (not flags["only-deps"]) and (not flags["keep"]) and not cfg.keep_other_versions then
          local ok, err = remove.remove_other_versions(name, version, flags["force"], flags["force-fast"])
          if not ok then util.printerr(err) end
diff --git a/src/luarocks/purge.lua b/src/luarocks/purge.lua
index 7647a243..50f290c8 100644
--- a/src/luarocks/purge.lua
+++ b/src/luarocks/purge.lua
@@ -64,7 +64,7 @@ function purge.command(flags)
             break
          else
             util.printout("Removing "..package.." "..version.."...")
-            local ok, err = repos.delete_version(package, version, true)
+            local ok, err = repos.delete_version(package, version, "none", true)
             if not ok then
                util.printerr(err)
             end
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index e2c05176..008d2616 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -60,12 +60,15 @@ end
 --- Delete given versions of a program.
 -- @param name string: the name of a program
 -- @param versions array of string: the versions to be deleted.
+-- @param deps_mode: string: Which trees to check dependencies for:
+-- "one" for the current default tree, "all" for all trees,
+-- "order" for all trees with priority >= the current default, "none" for no trees.
 -- @return boolean or (nil, string): true on success or nil and an error message.
-local function delete_versions(name, versions) 
+local function delete_versions(name, versions, deps_mode) 
 
    for version, _ in pairs(versions) do
       util.printout("Removing "..name.." "..version.."...")
-      local ok, err = repos.delete_version(name, version)
+      local ok, err = repos.delete_version(name, version, deps_mode)
       if not ok then return nil, err end
    end
    
@@ -110,9 +113,7 @@ function remove.remove_search_results(results, name, deps_mode, force, fast)
       end
    end
    
-   local ok, err = delete_versions(name, versions)
-   if not ok then return nil, err end
-   ok, err = writer.make_manifest(cfg.rocks_dir, deps_mode)
+   local ok, err = delete_versions(name, versions, deps_mode)
    if not ok then return nil, err end
 
    util.printout("Removal successful.")
diff --git a/src/luarocks/repos.lua b/src/luarocks/repos.lua
index 7acb00b9..a5698b8f 100644
--- a/src/luarocks/repos.lua
+++ b/src/luarocks/repos.lua
@@ -8,6 +8,7 @@ local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local dir = require("luarocks.dir")
 local manif = require("luarocks.manif")
+local writer = require("luarocks.manif.writer")
 local deps = require("luarocks.deps")
 
 --- Get all installed versions of a package.
@@ -266,13 +267,17 @@ end
 -- Version numbers are compared as exact string comparison.
 -- @param name string: name of package
 -- @param version string: package version in string format
+-- @param deps_mode: string: Which trees to check dependencies for:
+-- "one" for the current default tree, "all" for all trees,
+-- "order" for all trees with priority >= the current default, "none" for no trees.
 -- @param quick boolean: do not try to fix the versioned name
 -- of another version that provides the same module that
 -- was deleted. This is used during 'purge', as every module
 -- will be eventually deleted.
-function repos.delete_version(name, version, quick)
+function repos.delete_version(name, version, deps_mode, quick)
    assert(type(name) == "string")
    assert(type(version) == "string")
+   assert(type(deps_mode) == "string")
 
    local function delete_deployed_file_tree(file_tree, deploy_dir, suffix)
       return recurse_rock_manifest_tree(file_tree, 
@@ -322,7 +327,12 @@ function repos.delete_version(name, version, quick)
    if not get_installed_versions(name) then
       fs.delete(dir.path(cfg.rocks_dir, name))
    end
-   return true
+   
+   if quick then
+      return true
+   end
+
+   return writer.make_manifest(cfg.rocks_dir, deps_mode)
 end
 
 return repos
diff --git a/test/test_environment.lua b/test/test_environment.lua
index f04c22b8..f813707a 100644
--- a/test/test_environment.lua
+++ b/test/test_environment.lua
@@ -514,6 +514,7 @@ function test_env.setup_specs(extra_rocks)
       package.path = test_env.env_variables.LUA_PATH
 
       test_env.platform = execute_output(test_env.testing_paths.lua .. " -e 'print(require(\"luarocks.core.cfg\").arch)'", false, test_env.env_variables)
+      test_env.lib_extension = execute_output(test_env.testing_paths.lua .. " -e 'print(require(\"luarocks.core.cfg\").lib_extension)'", false, test_env.env_variables)
       test_env.md5sums = create_md5sums(test_env.testing_paths)
       test_env.setup_done = true
       title("RUNNING TESTS")