From 427b40db5c1e0940dd4469fe0a0827bc71929fdc Mon Sep 17 00:00:00 2001 From: mpeterv Date: Thu, 13 Mar 2014 09:56:53 +0400 Subject: Removed some unused variables --- src/luarocks/add.lua | 1 - src/luarocks/admin_remove.lua | 1 - src/luarocks/build.lua | 1 - src/luarocks/command_line.lua | 2 +- src/luarocks/deps.lua | 1 - src/luarocks/help.lua | 1 - src/luarocks/loader.lua | 1 - src/luarocks/manif.lua | 2 +- src/luarocks/new_version.lua | 2 -- src/luarocks/persist.lua | 2 +- src/luarocks/search.lua | 1 - src/luarocks/show.lua | 12 ------------ src/luarocks/write_rockspec.lua | 1 - 13 files changed, 3 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/luarocks/add.lua b/src/luarocks/add.lua index f1142d2a..c7acd5f8 100644 --- a/src/luarocks/add.lua +++ b/src/luarocks/add.lua @@ -5,7 +5,6 @@ module("luarocks.add", package.seeall) local cfg = require("luarocks.cfg") local util = require("luarocks.util") -local fetch = require("luarocks.fetch") local dir = require("luarocks.dir") local manif = require("luarocks.manif") local index = require("luarocks.index") diff --git a/src/luarocks/admin_remove.lua b/src/luarocks/admin_remove.lua index 8f105baf..477592b1 100644 --- a/src/luarocks/admin_remove.lua +++ b/src/luarocks/admin_remove.lua @@ -5,7 +5,6 @@ module("luarocks.admin_remove", package.seeall) local cfg = require("luarocks.cfg") local util = require("luarocks.util") -local fetch = require("luarocks.fetch") local dir = require("luarocks.dir") local manif = require("luarocks.manif") local index = require("luarocks.index") diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua index 4e433f74..30cdd309 100644 --- a/src/luarocks/build.lua +++ b/src/luarocks/build.lua @@ -12,7 +12,6 @@ local fs = require("luarocks.fs") local dir = require("luarocks.dir") local deps = require("luarocks.deps") local manif = require("luarocks.manif") -local search = require("luarocks.search") local remove = require("luarocks.remove") local cfg = require("luarocks.cfg") diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua index f9fba300..1c29aa77 100644 --- a/src/luarocks/command_line.lua +++ b/src/luarocks/command_line.lua @@ -25,7 +25,7 @@ local function die(message, exitcode) end local function replace_tree(flags, args, tree) - local tree = dir.normalize(tree) + tree = dir.normalize(tree) flags["tree"] = tree for i = 1, #args do if args[i]:match("%-%-tree=") then diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index c7d68d68..567a576b 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua @@ -140,7 +140,6 @@ function parse_version(vstring) version[i] = 0 break end - local last = #version version[i] = deltas[token] or (token:byte() / 1000) end vstring = rest diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua index 2c87e7e4..9f622f96 100644 --- a/src/luarocks/help.lua +++ b/src/luarocks/help.lua @@ -71,7 +71,6 @@ function run(...) Variables from the "variables" table of the configuration file can be overriden with VAR=VALUE assignments.]]) print_section("COMMANDS") - local names = {} for name, command in util.sortedpairs(commands) do local cmd = require(command) util.printout("", name) diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua index d828a359..d2fa4859 100644 --- a/src/luarocks/loader.lua +++ b/src/luarocks/loader.lua @@ -58,7 +58,6 @@ function add_context(name, version) return nil end - local providers = {} for _, tree in ipairs(rocks_trees) do local manifest = tree.manifest diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua index 951d6e56..c14200df 100644 --- a/src/luarocks/manif.lua +++ b/src/luarocks/manif.lua @@ -79,7 +79,7 @@ function make_rock_manifest(name, version) last[last_name] = sum end end - local rock_manifest = { rock_manifest=tree } + rock_manifest = { rock_manifest=tree } rock_manifest_cache[name.."/"..version] = rock_manifest save_table(install_dir, "rock_manifest", rock_manifest ) end diff --git a/src/luarocks/new_version.lua b/src/luarocks/new_version.lua index 4ca003f7..883d2ea9 100644 --- a/src/luarocks/new_version.lua +++ b/src/luarocks/new_version.lua @@ -4,11 +4,9 @@ module("luarocks.new_version", package.seeall) local util = require("luarocks.util") -local cfg = require("luarocks.cfg") local download = require("luarocks.download") local fetch = require("luarocks.fetch") local persist = require("luarocks.persist") -local dir = require("luarocks.dir") local fs = require("luarocks.fs") local type_check = require("luarocks.type_check") diff --git a/src/luarocks/persist.lua b/src/luarocks/persist.lua index 8f07da75..ca6a1f8c 100644 --- a/src/luarocks/persist.lua +++ b/src/luarocks/persist.lua @@ -19,7 +19,7 @@ function load_into_table(filename, tbl) assert(type(tbl) == "table" or not tbl) local result, chunk, ran, err - local result = tbl or {} + result = tbl or {} local globals = {} local globals_mt = { __index = function(t, n) diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua index f0659e0f..574ada40 100644 --- a/src/luarocks/search.lua +++ b/src/luarocks/search.lua @@ -217,7 +217,6 @@ function search_repos(query) end -- search through rocks in cfg.rocks_provided local provided_repo = "provided by VM or rocks_provided" - local name, versions for name, versions in pairs(cfg.rocks_provided) do store_if_match(results, provided_repo, name, versions, "installed", query) end diff --git a/src/luarocks/show.lua b/src/luarocks/show.lua index 49e235d9..36225208 100644 --- a/src/luarocks/show.lua +++ b/src/luarocks/show.lua @@ -6,7 +6,6 @@ local search = require("luarocks.search") local cfg = require("luarocks.cfg") local util = require("luarocks.util") local path = require("luarocks.path") -local dir = require("luarocks.dir") local deps = require("luarocks.deps") local fetch = require("luarocks.fetch") local manif = require("luarocks.manif") @@ -54,17 +53,6 @@ local function format_text(text) return (table.concat(paragraphs, "\n\n"):gsub("%s$", "")) end -local function module_name(mod, filename, name, version, repo, manifest) - local base_dir - if filename:match("%.lua$") then - base_dir = path.deploy_lua_dir(repo) - else - base_dir = path.deploy_lib_dir(repo) - end - - return dir.path(base_dir, filename) -end - function pick_installed_rock(name, version, tree) local results = {} local query = search.make_query(name, version) diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/write_rockspec.lua index 05948922..9cd8f892 100644 --- a/src/luarocks/write_rockspec.lua +++ b/src/luarocks/write_rockspec.lua @@ -49,7 +49,6 @@ local function get_url(rockspec) return false end util.printout("File successfully downloaded. Making checksum and checking base dir...") - local md5 = nil if fetch.is_basic_protocol(rockspec.source.protocol) then rockspec.source.md5 = fs.get_md5(file) end -- cgit v1.2.3-55-g6feb