diff options
-rw-r--r-- | src/luarocks/add.lua | 1 | ||||
-rw-r--r-- | src/luarocks/admin_remove.lua | 1 | ||||
-rw-r--r-- | src/luarocks/build.lua | 1 | ||||
-rw-r--r-- | src/luarocks/command_line.lua | 2 | ||||
-rw-r--r-- | src/luarocks/deps.lua | 1 | ||||
-rw-r--r-- | src/luarocks/help.lua | 1 | ||||
-rw-r--r-- | src/luarocks/loader.lua | 1 | ||||
-rw-r--r-- | src/luarocks/manif.lua | 2 | ||||
-rw-r--r-- | src/luarocks/new_version.lua | 2 | ||||
-rw-r--r-- | src/luarocks/persist.lua | 2 | ||||
-rw-r--r-- | src/luarocks/search.lua | 1 | ||||
-rw-r--r-- | src/luarocks/show.lua | 12 | ||||
-rw-r--r-- | src/luarocks/write_rockspec.lua | 1 |
13 files changed, 3 insertions, 25 deletions
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) | |||
5 | 5 | ||
6 | local cfg = require("luarocks.cfg") | 6 | local cfg = require("luarocks.cfg") |
7 | local util = require("luarocks.util") | 7 | local util = require("luarocks.util") |
8 | local fetch = require("luarocks.fetch") | ||
9 | local dir = require("luarocks.dir") | 8 | local dir = require("luarocks.dir") |
10 | local manif = require("luarocks.manif") | 9 | local manif = require("luarocks.manif") |
11 | local index = require("luarocks.index") | 10 | 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) | |||
5 | 5 | ||
6 | local cfg = require("luarocks.cfg") | 6 | local cfg = require("luarocks.cfg") |
7 | local util = require("luarocks.util") | 7 | local util = require("luarocks.util") |
8 | local fetch = require("luarocks.fetch") | ||
9 | local dir = require("luarocks.dir") | 8 | local dir = require("luarocks.dir") |
10 | local manif = require("luarocks.manif") | 9 | local manif = require("luarocks.manif") |
11 | local index = require("luarocks.index") | 10 | 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") | |||
12 | local dir = require("luarocks.dir") | 12 | local dir = require("luarocks.dir") |
13 | local deps = require("luarocks.deps") | 13 | local deps = require("luarocks.deps") |
14 | local manif = require("luarocks.manif") | 14 | local manif = require("luarocks.manif") |
15 | local search = require("luarocks.search") | ||
16 | local remove = require("luarocks.remove") | 15 | local remove = require("luarocks.remove") |
17 | local cfg = require("luarocks.cfg") | 16 | local cfg = require("luarocks.cfg") |
18 | 17 | ||
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) | |||
25 | end | 25 | end |
26 | 26 | ||
27 | local function replace_tree(flags, args, tree) | 27 | local function replace_tree(flags, args, tree) |
28 | local tree = dir.normalize(tree) | 28 | tree = dir.normalize(tree) |
29 | flags["tree"] = tree | 29 | flags["tree"] = tree |
30 | for i = 1, #args do | 30 | for i = 1, #args do |
31 | if args[i]:match("%-%-tree=") then | 31 | 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) | |||
140 | version[i] = 0 | 140 | version[i] = 0 |
141 | break | 141 | break |
142 | end | 142 | end |
143 | local last = #version | ||
144 | version[i] = deltas[token] or (token:byte() / 1000) | 143 | version[i] = deltas[token] or (token:byte() / 1000) |
145 | end | 144 | end |
146 | vstring = rest | 145 | 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(...) | |||
71 | Variables from the "variables" table of the configuration file | 71 | Variables from the "variables" table of the configuration file |
72 | can be overriden with VAR=VALUE assignments.]]) | 72 | can be overriden with VAR=VALUE assignments.]]) |
73 | print_section("COMMANDS") | 73 | print_section("COMMANDS") |
74 | local names = {} | ||
75 | for name, command in util.sortedpairs(commands) do | 74 | for name, command in util.sortedpairs(commands) do |
76 | local cmd = require(command) | 75 | local cmd = require(command) |
77 | util.printout("", name) | 76 | 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) | |||
58 | return nil | 58 | return nil |
59 | end | 59 | end |
60 | 60 | ||
61 | local providers = {} | ||
62 | for _, tree in ipairs(rocks_trees) do | 61 | for _, tree in ipairs(rocks_trees) do |
63 | local manifest = tree.manifest | 62 | local manifest = tree.manifest |
64 | 63 | ||
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua index 99702b46..a239b206 100644 --- a/src/luarocks/manif.lua +++ b/src/luarocks/manif.lua | |||
@@ -79,7 +79,7 @@ function make_rock_manifest(name, version) | |||
79 | last[last_name] = sum | 79 | last[last_name] = sum |
80 | end | 80 | end |
81 | end | 81 | end |
82 | local rock_manifest = { rock_manifest=tree } | 82 | rock_manifest = { rock_manifest=tree } |
83 | rock_manifest_cache[name.."/"..version] = rock_manifest | 83 | rock_manifest_cache[name.."/"..version] = rock_manifest |
84 | save_table(install_dir, "rock_manifest", rock_manifest ) | 84 | save_table(install_dir, "rock_manifest", rock_manifest ) |
85 | end | 85 | 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 @@ | |||
4 | module("luarocks.new_version", package.seeall) | 4 | module("luarocks.new_version", package.seeall) |
5 | 5 | ||
6 | local util = require("luarocks.util") | 6 | local util = require("luarocks.util") |
7 | local cfg = require("luarocks.cfg") | ||
8 | local download = require("luarocks.download") | 7 | local download = require("luarocks.download") |
9 | local fetch = require("luarocks.fetch") | 8 | local fetch = require("luarocks.fetch") |
10 | local persist = require("luarocks.persist") | 9 | local persist = require("luarocks.persist") |
11 | local dir = require("luarocks.dir") | ||
12 | local fs = require("luarocks.fs") | 10 | local fs = require("luarocks.fs") |
13 | local type_check = require("luarocks.type_check") | 11 | local type_check = require("luarocks.type_check") |
14 | 12 | ||
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) | |||
19 | assert(type(tbl) == "table" or not tbl) | 19 | assert(type(tbl) == "table" or not tbl) |
20 | 20 | ||
21 | local result, chunk, ran, err | 21 | local result, chunk, ran, err |
22 | local result = tbl or {} | 22 | result = tbl or {} |
23 | local globals = {} | 23 | local globals = {} |
24 | local globals_mt = { | 24 | local globals_mt = { |
25 | __index = function(t, n) | 25 | __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) | |||
217 | end | 217 | end |
218 | -- search through rocks in cfg.rocks_provided | 218 | -- search through rocks in cfg.rocks_provided |
219 | local provided_repo = "provided by VM or rocks_provided" | 219 | local provided_repo = "provided by VM or rocks_provided" |
220 | local name, versions | ||
221 | for name, versions in pairs(cfg.rocks_provided) do | 220 | for name, versions in pairs(cfg.rocks_provided) do |
222 | store_if_match(results, provided_repo, name, versions, "installed", query) | 221 | store_if_match(results, provided_repo, name, versions, "installed", query) |
223 | end | 222 | 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") | |||
6 | local cfg = require("luarocks.cfg") | 6 | local cfg = require("luarocks.cfg") |
7 | local util = require("luarocks.util") | 7 | local util = require("luarocks.util") |
8 | local path = require("luarocks.path") | 8 | local path = require("luarocks.path") |
9 | local dir = require("luarocks.dir") | ||
10 | local deps = require("luarocks.deps") | 9 | local deps = require("luarocks.deps") |
11 | local fetch = require("luarocks.fetch") | 10 | local fetch = require("luarocks.fetch") |
12 | local manif = require("luarocks.manif") | 11 | local manif = require("luarocks.manif") |
@@ -54,17 +53,6 @@ local function format_text(text) | |||
54 | return (table.concat(paragraphs, "\n\n"):gsub("%s$", "")) | 53 | return (table.concat(paragraphs, "\n\n"):gsub("%s$", "")) |
55 | end | 54 | end |
56 | 55 | ||
57 | local function module_name(mod, filename, name, version, repo, manifest) | ||
58 | local base_dir | ||
59 | if filename:match("%.lua$") then | ||
60 | base_dir = path.deploy_lua_dir(repo) | ||
61 | else | ||
62 | base_dir = path.deploy_lib_dir(repo) | ||
63 | end | ||
64 | |||
65 | return dir.path(base_dir, filename) | ||
66 | end | ||
67 | |||
68 | function pick_installed_rock(name, version, tree) | 56 | function pick_installed_rock(name, version, tree) |
69 | local results = {} | 57 | local results = {} |
70 | local query = search.make_query(name, version) | 58 | 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) | |||
49 | return false | 49 | return false |
50 | end | 50 | end |
51 | util.printout("File successfully downloaded. Making checksum and checking base dir...") | 51 | util.printout("File successfully downloaded. Making checksum and checking base dir...") |
52 | local md5 = nil | ||
53 | if fetch.is_basic_protocol(rockspec.source.protocol) then | 52 | if fetch.is_basic_protocol(rockspec.source.protocol) then |
54 | rockspec.source.md5 = fs.get_md5(file) | 53 | rockspec.source.md5 = fs.get_md5(file) |
55 | end | 54 | end |