diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2013-07-02 22:26:10 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2013-07-02 22:26:10 -0300 |
| commit | 12e7f99eddd5c4bfe2e69607b53af186bc10fb02 (patch) | |
| tree | 0541203344aecfdafa840f518b90689212bb234e | |
| parent | e494bbe5b91bd2ba5c7e1f231ff1d6f58cf6ccdb (diff) | |
| download | luarocks-12e7f99eddd5c4bfe2e69607b53af186bc10fb02.tar.gz luarocks-12e7f99eddd5c4bfe2e69607b53af186bc10fb02.tar.bz2 luarocks-12e7f99eddd5c4bfe2e69607b53af186bc10fb02.zip | |
expose lua_version variable to config files.
| -rw-r--r-- | src/luarocks/cfg.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 967d756c..22207531 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua | |||
| @@ -137,13 +137,13 @@ if not site_config.LUAROCKS_FORCE_CONFIG then | |||
| 137 | local home_overrides, err | 137 | local home_overrides, err |
| 138 | home_config_file = os.getenv("LUAROCKS_CONFIG_" .. version_suffix) or os.getenv("LUAROCKS_CONFIG") | 138 | home_config_file = os.getenv("LUAROCKS_CONFIG_" .. version_suffix) or os.getenv("LUAROCKS_CONFIG") |
| 139 | if home_config_file then | 139 | if home_config_file then |
| 140 | home_overrides, err = persist.load_into_table(home_config_file, { home = home }) | 140 | home_overrides, err = persist.load_into_table(home_config_file, { home = home, lua_version = lua_version }) |
| 141 | else | 141 | else |
| 142 | home_config_file = home_config_dir.."/config-"..lua_version..".lua" | 142 | home_config_file = home_config_dir.."/config-"..lua_version..".lua" |
| 143 | home_overrides, err = persist.load_into_table(home_config_file, { home = home }) | 143 | home_overrides, err = persist.load_into_table(home_config_file, { home = home, lua_version = lua_version }) |
| 144 | if not home_overrides then | 144 | if not home_overrides then |
| 145 | home_config_file = home_config_dir.."/config.lua" | 145 | home_config_file = home_config_dir.."/config.lua" |
| 146 | home_overrides, err = persist.load_into_table(home_config_file, { home = home }) | 146 | home_overrides, err = persist.load_into_table(home_config_file, { home = home, lua_version = lua_version }) |
| 147 | end | 147 | end |
| 148 | end | 148 | end |
| 149 | if home_overrides then | 149 | if home_overrides then |