From 31dbd1d37ed8ccc9a7da706a59ab918833e26917 Mon Sep 17 00:00:00 2001 From: Paul Ouellette Date: Fri, 16 Aug 2019 17:44:06 -0400 Subject: Revert variable rename in cmd/make.lua --- src/luarocks/cmd/make.lua | 12 ++++++------ 1 file 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 -- @return boolean or (nil, string, exitcode): True if build was successful; nil and an -- error message otherwise. exitcode is optionally returned. function make.command(args) - local rockspec = args.rockspec - if not rockspec then + local rockspec_filename = args.rockspec + if not rockspec_filename then local err - rockspec, err = util.get_default_rockspec() - if not rockspec then + rockspec_filename, err = util.get_default_rockspec() + if not rockspec_filename then return nil, err end end - if not rockspec:match("rockspec$") then + if not rockspec_filename:match("rockspec$") then return nil, "Invalid argument: 'make' takes a rockspec as a parameter. "..util.see_help("make") end - local rockspec, err, errcode = fetch.load_rockspec(rockspec) + local rockspec, err, errcode = fetch.load_rockspec(rockspec_filename) if not rockspec then return nil, err end -- cgit v1.2.3-55-g6feb