From 8915604a681c997166dbb163fc6e8a0e4e1de1fe Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Tue, 10 May 2016 20:42:12 +0300 Subject: Rename broken --force=fast to --force-fast --- src/luarocks/build.lua | 2 +- src/luarocks/install.lua | 2 +- src/luarocks/make.lua | 2 +- src/luarocks/purge.lua | 2 +- src/luarocks/remove.lua | 14 +++++++------- src/luarocks/util.lua | 1 + 6 files changed, 12 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua index bdc3b57a..a1aeb501 100644 --- a/src/luarocks/build.lua +++ b/src/luarocks/build.lua @@ -418,7 +418,7 @@ function build.run(...) return name, version end if (not flags["keep"]) and not cfg.keep_other_versions then - local ok, err = remove.remove_other_versions(name, version, flags["force"]) + local ok, err = remove.remove_other_versions(name, version, flags["force"], flags["force-fast"]) if not ok then util.printerr(err) end end return name, version diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua index 24f1accd..e7e6bb20 100644 --- a/src/luarocks/install.lua +++ b/src/luarocks/install.lua @@ -180,7 +180,7 @@ function install.run(...) if not ok then return nil, err end local name, version = ok, err if (not flags["only-deps"]) and (not flags["keep"]) and not cfg.keep_other_versions then - local ok, err = remove.remove_other_versions(name, version, flags["force"]) + local ok, err = remove.remove_other_versions(name, version, flags["force"], flags["force-fast"]) if not ok then util.printerr(err) end end return name, version diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua index 94cf4414..78c43d91 100644 --- a/src/luarocks/make.lua +++ b/src/luarocks/make.lua @@ -132,7 +132,7 @@ function make.run(...) if not ok then return nil, err end local name, version = ok, err if (not flags["keep"]) and not cfg.keep_other_versions then - local ok, err = remove.remove_other_versions(name, version, flags["force"]) + local ok, err = remove.remove_other_versions(name, version, flags["force"], flags["force-fast"]) if not ok then util.printerr(err) end end return name, version diff --git a/src/luarocks/purge.lua b/src/luarocks/purge.lua index ba9b8705..bd5494f6 100644 --- a/src/luarocks/purge.lua +++ b/src/luarocks/purge.lua @@ -61,7 +61,7 @@ function purge.run(...) for version, repositories in util.sortedpairs(versions, sort) do if flags["old-versions"] then util.printout("Keeping "..package.." "..version.."...") - local ok, err = remove.remove_other_versions(package, version, flags["force"]) + local ok, err = remove.remove_other_versions(package, version, flags["force"], flags["force-fast"]) if not ok then util.printerr(err) end diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua index 04fa5be6..9e1ae217 100644 --- a/src/luarocks/remove.lua +++ b/src/luarocks/remove.lua @@ -23,7 +23,7 @@ If a version is not given, try to remove all versions at once. Will only perform the removal if it does not break dependencies. To override this check and force the removal, use --force. To perform a forced removal without reporting dependency issues, -use --force=fast. +use --force-fast. ]]..util.deps_mode_help() @@ -74,14 +74,14 @@ local function delete_versions(name, versions) return true end -function remove.remove_search_results(results, name, deps_mode, force) +function remove.remove_search_results(results, name, deps_mode, force, fast) local versions = results[name] local version = next(versions) local second = next(versions, version) local dependents = {} - if force ~= "fast" then + if not fast then util.printout("Checking stability of dependencies in the absence of") util.printout(name.." "..table.concat(util.keys(versions), ", ").."...") util.printout() @@ -89,7 +89,7 @@ function remove.remove_search_results(results, name, deps_mode, force) end if #dependents > 0 then - if force then + if force or fast then util.printerr("The following packages may be broken by this forced removal:") for _, dependent in ipairs(dependents) do util.printerr(dependent.name.." "..dependent.version) @@ -121,11 +121,11 @@ function remove.remove_search_results(results, name, deps_mode, force) return true end -function remove.remove_other_versions(name, version, force) +function remove.remove_other_versions(name, version, force, fast) local results = {} search.manifest_search(results, cfg.rocks_dir, { name = name, exact_name = true, constraints = {{ op = "~=", version = version}} }) if results[name] then - return remove.remove_search_results(results, name, cfg.deps_mode, force) + return remove.remove_search_results(results, name, cfg.deps_mode, force, fast) end return true end @@ -162,7 +162,7 @@ function remove.run(...) return nil, "Could not find rock '"..name..(version and " "..version or "").."' in "..path.rocks_tree_to_string(cfg.root_dir) end - return remove.remove_search_results(results, name, deps_mode, flags["force"]) + return remove.remove_search_results(results, name, deps_mode, flags["force"], flags["force-fast"]) end return remove diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua index c06c8354..80f1684a 100644 --- a/src/luarocks/util.lua +++ b/src/luarocks/util.lua @@ -82,6 +82,7 @@ local supported_flags = { ["deps-mode"] = "", ["detailed"] = "\"\"", ["force"] = true, + ["force-fast"] = true, ["from"] = "", ["help"] = true, ["home"] = true, -- cgit v1.2.3-55-g6feb