diff options
| author | Paul Ouellette <oue.paul18@gmail.com> | 2019-08-16 17:44:06 -0400 |
|---|---|---|
| committer | Paul Ouellette <oue.paul18@gmail.com> | 2019-08-17 00:56:37 -0400 |
| commit | 31dbd1d37ed8ccc9a7da706a59ab918833e26917 (patch) | |
| tree | 28d11ab78b724af630e062f2aadd163c5c9451e3 | |
| parent | 209e95008c4069e51f55790fbc2fc7961fca0426 (diff) | |
| download | luarocks-31dbd1d37ed8ccc9a7da706a59ab918833e26917.tar.gz luarocks-31dbd1d37ed8ccc9a7da706a59ab918833e26917.tar.bz2 luarocks-31dbd1d37ed8ccc9a7da706a59ab918833e26917.zip | |
Revert variable rename in cmd/make.lua
| -rw-r--r-- | src/luarocks/cmd/make.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/luarocks/cmd/make.lua b/src/luarocks/cmd/make.lua index e04bba96..ef99218a 100644 --- a/src/luarocks/cmd/make.lua +++ b/src/luarocks/cmd/make.lua | |||
| @@ -71,19 +71,19 @@ end | |||
| 71 | -- @return boolean or (nil, string, exitcode): True if build was successful; nil and an | 71 | -- @return boolean or (nil, string, exitcode): True if build was successful; nil and an |
| 72 | -- error message otherwise. exitcode is optionally returned. | 72 | -- error message otherwise. exitcode is optionally returned. |
| 73 | function make.command(args) | 73 | function make.command(args) |
| 74 | local rockspec = args.rockspec | 74 | local rockspec_filename = args.rockspec |
| 75 | if not rockspec then | 75 | if not rockspec_filename then |
| 76 | local err | 76 | local err |
| 77 | rockspec, err = util.get_default_rockspec() | 77 | rockspec_filename, err = util.get_default_rockspec() |
| 78 | if not rockspec then | 78 | if not rockspec_filename then |
| 79 | return nil, err | 79 | return nil, err |
| 80 | end | 80 | end |
| 81 | end | 81 | end |
| 82 | if not rockspec:match("rockspec$") then | 82 | if not rockspec_filename:match("rockspec$") then |
| 83 | return nil, "Invalid argument: 'make' takes a rockspec as a parameter. "..util.see_help("make") | 83 | return nil, "Invalid argument: 'make' takes a rockspec as a parameter. "..util.see_help("make") |
| 84 | end | 84 | end |
| 85 | 85 | ||
| 86 | local rockspec, err, errcode = fetch.load_rockspec(rockspec) | 86 | local rockspec, err, errcode = fetch.load_rockspec(rockspec_filename) |
| 87 | if not rockspec then | 87 | if not rockspec then |
| 88 | return nil, err | 88 | return nil, err |
| 89 | end | 89 | end |