diff options
author | Fabio Mascarenhas <mascarenhas@lambda-2.local> | 2010-03-24 19:52:17 -0300 |
---|---|---|
committer | Fabio Mascarenhas <mascarenhas@lambda-2.local> | 2010-03-24 19:52:17 -0300 |
commit | 41b0c918d4974f39caed5b6c3eef05034653c6f5 (patch) | |
tree | eaa9d484b9d3e52d81ea0c612eb999b738e51fa9 | |
parent | 674cc79dada6c2d85ae35a305d5b6994f4085ee9 (diff) | |
download | luarocks-2.0.2.tar.gz luarocks-2.0.2.tar.bz2 luarocks-2.0.2.zip |
remove need for --force when installing over non-versioned filesv2.0.2
-rw-r--r-- | src/luarocks/rep.lua | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/luarocks/rep.lua b/src/luarocks/rep.lua index 8b42caa2..5da5953f 100644 --- a/src/luarocks/rep.lua +++ b/src/luarocks/rep.lua | |||
@@ -210,11 +210,7 @@ function deploy_files(name, version) | |||
210 | if fs.exists(target) then | 210 | if fs.exists(target) then |
211 | local new_target, err = resolve_conflict(target, deploy_dir, name, version) | 211 | local new_target, err = resolve_conflict(target, deploy_dir, name, version) |
212 | if err == "untracked" then | 212 | if err == "untracked" then |
213 | if cfg.flags["force"] then | 213 | fs.delete(target) |
214 | fs.delete(target) | ||
215 | else | ||
216 | return nil, "File "..file.." is not tracked by LuaRocks. Cannot install new version. Install with --force if you want to install anyway." | ||
217 | end | ||
218 | elseif err then return nil, err.." Cannot install new version." | 214 | elseif err then return nil, err.." Cannot install new version." |
219 | else target = new_target end | 215 | else target = new_target end |
220 | end | 216 | end |