diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2015-06-24 11:06:03 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-06-24 11:06:03 -0300 |
| commit | 85edc261eb543315002b888068693c0bbf087009 (patch) | |
| tree | 31e834d8b27466658917ec1dfa2605e6c209e379 /src | |
| parent | 58220b2b07d742313482975a7aa121f4b3fcce9e (diff) | |
| download | luarocks-85edc261eb543315002b888068693c0bbf087009.tar.gz luarocks-85edc261eb543315002b888068693c0bbf087009.tar.bz2 luarocks-85edc261eb543315002b888068693c0bbf087009.zip | |
Remove `--extensions` flag. Fixes #391.
Instead of enabling extensions, use a higher value for `rockspec_format`
when writing rockspecs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/cfg.lua | 1 | ||||
| -rw-r--r-- | src/luarocks/command_line.lua | 6 | ||||
| -rw-r--r-- | src/luarocks/util.lua | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 20aa4a21..52b8c089 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua | |||
| @@ -212,7 +212,6 @@ end | |||
| 212 | local defaults = { | 212 | local defaults = { |
| 213 | 213 | ||
| 214 | local_by_default = false, | 214 | local_by_default = false, |
| 215 | use_extensions = false, | ||
| 216 | accept_unknown_fields = false, | 215 | accept_unknown_fields = false, |
| 217 | fs_use_modules = true, | 216 | fs_use_modules = true, |
| 218 | hooks_enabled = true, | 217 | hooks_enabled = true, |
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua index 495fe855..dbf64b9c 100644 --- a/src/luarocks/command_line.lua +++ b/src/luarocks/command_line.lua | |||
| @@ -113,12 +113,6 @@ function command_line.run_command(...) | |||
| 113 | end | 113 | end |
| 114 | end | 114 | end |
| 115 | command = command:gsub("-", "_") | 115 | command = command:gsub("-", "_") |
| 116 | |||
| 117 | if flags["extensions"] then | ||
| 118 | cfg.use_extensions = true | ||
| 119 | local type_check = require("luarocks.type_check") | ||
| 120 | type_check.load_extensions() | ||
| 121 | end | ||
| 122 | 116 | ||
| 123 | if cfg.local_by_default then | 117 | if cfg.local_by_default then |
| 124 | flags["local"] = true | 118 | flags["local"] = true |
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua index 6a99b568..6fecf863 100644 --- a/src/luarocks/util.lua +++ b/src/luarocks/util.lua | |||
| @@ -81,7 +81,6 @@ local supported_flags = { | |||
| 81 | ["deps"] = true, | 81 | ["deps"] = true, |
| 82 | ["deps-mode"] = "<mode>", | 82 | ["deps-mode"] = "<mode>", |
| 83 | ["detailed"] = "\"<text>\"", | 83 | ["detailed"] = "\"<text>\"", |
| 84 | ["extensions"] = true, | ||
| 85 | ["force"] = true, | 84 | ["force"] = true, |
| 86 | ["from"] = "<server>", | 85 | ["from"] = "<server>", |
| 87 | ["help"] = true, | 86 | ["help"] = true, |
