From 0409a52f478849fb47d1793ed5a85853460d863e Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 19 Dec 2017 12:25:44 -0200 Subject: Differentiate "not found" and "fail" when deleting. Do not halt a deletion process when trying to delete something that was not found. --- src/luarocks/repos.lua | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/luarocks/repos.lua b/src/luarocks/repos.lua index abc62b0d..23ed22f5 100644 --- a/src/luarocks/repos.lua +++ b/src/luarocks/repos.lua @@ -209,12 +209,12 @@ end local function delete_suffixed(file, suffix) local suffixed_file, err = find_suffixed(file, suffix) if not suffixed_file then - return nil, "Could not remove " .. file .. ": " .. err + return nil, "Could not remove " .. file .. ": " .. err, "not found" end fs.delete(suffixed_file) if fs.exists(suffixed_file) then - return nil, "Failed deleting " .. suffixed_file .. ": file still exists" + return nil, "Failed deleting " .. suffixed_file .. ": file still exists", "fail" end return true @@ -375,8 +375,14 @@ function repos.delete_version(name, version, deps_mode, quick) target = versioned end - local ok, err = delete_suffixed(target, suffix) - if not ok then return nil, err end + local ok, err, err_type = delete_suffixed(target, suffix) + if not ok then + if err_type == "not found" then + util.warning(err) + else + return nil, err + end + end if not quick and target == non_versioned then -- If another package provides this file, move its version -- cgit v1.2.3-55-g6feb