aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/luarocks/rep.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/luarocks/rep.lua b/src/luarocks/rep.lua
index 5eb8860a..2b5b3158 100644
--- a/src/luarocks/rep.lua
+++ b/src/luarocks/rep.lua
@@ -95,8 +95,8 @@ function package_modules(package, version)
95 local result = {} 95 local result = {}
96 local rock_manifest = manif.load_rock_manifest(package, version) 96 local rock_manifest = manif.load_rock_manifest(package, version)
97 97
98 store_package_data(result, name, rock_manifest.lib) 98 store_package_data(result, package, rock_manifest.lib)
99 store_package_data(result, name, rock_manifest.lua) 99 store_package_data(result, package, rock_manifest.lua)
100 return result 100 return result
101end 101end
102 102
@@ -211,6 +211,7 @@ function deploy_files(name, version)
211 function(parent_path, parent_module, file) 211 function(parent_path, parent_module, file)
212 local source = dir.path(source_dir, parent_path, file) 212 local source = dir.path(source_dir, parent_path, file)
213 local target = dir.path(deploy_dir, parent_path, file) 213 local target = dir.path(deploy_dir, parent_path, file)
214 local ok, err
214 if fs.exists(target) then 215 if fs.exists(target) then
215 target, err = resolve_conflict(target, deploy_dir, name, version) 216 target, err = resolve_conflict(target, deploy_dir, name, version)
216 if err then return nil, err.." Cannot install new version." end 217 if err then return nil, err.." Cannot install new version." end