aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/luarocks/fetch.lua3
-rw-r--r--src/luarocks/fs/win32/tools.lua2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index 4031ec66..a49bb8f1 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -134,7 +134,8 @@ function fetch.fetch_and_unpack_rock(rock_file, dest)
134 134
135 local name = dir.base_name(rock_file):match("(.*)%.[^.]*%.rock") 135 local name = dir.base_name(rock_file):match("(.*)%.[^.]*%.rock")
136 136
137 local rock_file, err, errcode = fetch.fetch_url_at_temp_dir(rock_file,"luarocks-rock-"..name) 137 local err, errcode
138 rock_file, err, errcode = fetch.fetch_url_at_temp_dir(rock_file,"luarocks-rock-"..name)
138 if not rock_file then 139 if not rock_file then
139 return nil, "Could not fetch rock file: " .. err, errcode 140 return nil, "Could not fetch rock file: " .. err, errcode
140 end 141 end
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index 633aae5e..f5e2ea2e 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -212,7 +212,7 @@ end
212--- Helper function for fs.set_permissions 212--- Helper function for fs.set_permissions
213-- @return table: an array of all system users 213-- @return table: an array of all system users
214local function get_system_users() 214local function get_system_users()
215 result = {} 215 local result = {}
216 local fd = assert(io.popen("wmic UserAccount get name")) 216 local fd = assert(io.popen("wmic UserAccount get name"))
217 for user in fd:lines() do 217 for user in fd:lines() do
218 user = user:gsub("%s+$", "") 218 user = user:gsub("%s+$", "")