Merge branch 'master' into luarocks-3

4 files changed, 29 insertions, 18 deletions

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index c43ee949..1d2925f9 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -348,7 +348,7 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
    ok, err = writer.make_rock_manifest(name, version)
    if err then return nil, err end
 
-   ok, err = repos.deploy_files(name, version, repos.should_wrap_bin_scripts(rockspec))
+   ok, err = repos.deploy_files(name, version, repos.should_wrap_bin_scripts(rockspec), deps_mode)
    if err then return nil, err end
    
    util.remove_scheduled_function(rollback)
@@ -359,9 +359,6 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
    ok, err = repos.run_hook(rockspec, "post_install")
    if err then return nil, err end
 
-   ok, err = writer.update_manifest(name, version, nil, deps_mode)
-   if err then return nil, err end
-
    util.announce_install(rockspec)
    util.remove_scheduled_function(rollback)
    return name, version
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index d9785b0c..3a4beb17 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -223,14 +223,11 @@ function builtin.run(rockspec)
          local ext = info:match("%.([^.]+)$")
          if ext == "lua" then
             local filename = dir.base_name(info)
-            if info:match("init%.lua$") and not name:match("%.init$") then
+            if filename == "init.lua" and not name:match("%.init$") then
                moddir = path.module_to_path(name..".init")
             else
                local basename = name:match("([^.]+)$")
-               local baseinfo = filename:gsub("%.lua$", "")
-               if basename ~= baseinfo then
-                  filename = basename..".lua"
-               end
+               filename = basename..".lua"
             end
             local dest = dir.path(luadir, moddir, filename)
             lua_modules[info] = dest
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index 6dded8ee..c9b085f5 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -82,7 +82,7 @@ function install.install_binary_rock(rock_file, deps_mode)
       if err then return nil, err, errcode end
    end
 
-   ok, err = repos.deploy_files(name, version, repos.should_wrap_bin_scripts(rockspec))
+   ok, err = repos.deploy_files(name, version, repos.should_wrap_bin_scripts(rockspec), deps_mode)
    if err then return nil, err end
 
    util.remove_scheduled_function(rollback)
@@ -92,10 +92,7 @@ function install.install_binary_rock(rock_file, deps_mode)
 
    ok, err = repos.run_hook(rockspec, "post_install")
    if err then return nil, err end
-   
-   ok, err = writer.update_manifest(name, version, nil, deps_mode)
-   if err then return nil, err end
-   
+
    util.announce_install(rockspec)
    util.remove_scheduled_function(rollback)
    return name, version
diff --git a/src/luarocks/repos.lua b/src/luarocks/repos.lua
index 0ed9068c..47a501af 100644
--- a/src/luarocks/repos.lua
+++ b/src/luarocks/repos.lua
@@ -191,7 +191,18 @@ function repos.should_wrap_bin_scripts(rockspec)
    return true
 end
 
-function repos.deploy_files(name, version, wrap_bin_scripts)
+--- Deploy a package from the rocks subdirectory.
+-- It is maintained that for each file the one that is provided
+-- by the newest version of the lexicographically smallest package
+-- is installed using unversioned name, and other versions of the file
+-- use versioned names.
+-- @param name string: name of package
+-- @param version string: exact package version in string format
+-- @param wrap_bin_scripts bool: whether commands written in Lua should be wrapped.
+-- @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.
+function repos.deploy_files(name, version, wrap_bin_scripts, deps_mode)
    assert(type(name) == "string")
    assert(type(version) == "string")
    assert(type(wrap_bin_scripts) == "boolean")
@@ -247,7 +258,13 @@ function repos.deploy_files(name, version, wrap_bin_scripts)
    if ok and rock_manifest.lib then
       ok, err = deploy_file_tree(rock_manifest.lib, path.lib_dir, cfg.deploy_lib_dir, make_mover(cfg.perm_exec))
    end
-   return ok, err
+
+   if not ok then
+      return nil, err
+   end
+
+   local writer = require("luarocks.manif.writer")
+   return writer.update_manifest(name, version, nil, deps_mode)
 end
 
 local function delete_suffixed(filename, suffix)
@@ -266,9 +283,12 @@ local function delete_suffixed(filename, suffix)
 end
 
 --- Delete a package from the local repository.
--- Version numbers are compared as exact string comparison.
+-- It is maintained that for each file the one that is provided
+-- by the newest version of the lexicographically smallest package
+-- is installed using unversioned name, and other versions of the file
+-- use versioned names.
 -- @param name string: name of package
--- @param version string: package version in string format
+-- @param version string: exact 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.