From 41b0c918d4974f39caed5b6c3eef05034653c6f5 Mon Sep 17 00:00:00 2001 From: Fabio Mascarenhas Date: Wed, 24 Mar 2010 19:52:17 -0300 Subject: remove need for --force when installing over non-versioned files --- src/luarocks/rep.lua | 6 +----- 1 file changed, 1 insertion(+), 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) if fs.exists(target) then local new_target, err = resolve_conflict(target, deploy_dir, name, version) if err == "untracked" then - if cfg.flags["force"] then - fs.delete(target) - else - return nil, "File "..file.." is not tracked by LuaRocks. Cannot install new version. Install with --force if you want to install anyway." - end + fs.delete(target) elseif err then return nil, err.." Cannot install new version." else target = new_target end end -- cgit v1.2.3-55-g6feb