aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Ouellette <oue.paul18@gmail.com>2019-08-16 19:44:28 -0400
committerPaul Ouellette <oue.paul18@gmail.com>2019-08-17 00:56:37 -0400
commit9fefe1dd0692e842693d6aea5c06396e0b25ee6f (patch)
treeb6f3c1d1181bfc1c9173ab9d43506ad27ce22526
parent31dbd1d37ed8ccc9a7da706a59ab918833e26917 (diff)
downloadluarocks-9fefe1dd0692e842693d6aea5c06396e0b25ee6f.tar.gz
luarocks-9fefe1dd0692e842693d6aea5c06396e0b25ee6f.tar.bz2
luarocks-9fefe1dd0692e842693d6aea5c06396e0b25ee6f.zip
writer.make_namespace_file: name has no namespace
-rw-r--r--src/luarocks/manif/writer.lua4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/luarocks/manif/writer.lua b/src/luarocks/manif/writer.lua
index 23ba2532..d6b70a5f 100644
--- a/src/luarocks/manif/writer.lua
+++ b/src/luarocks/manif/writer.lua
@@ -279,7 +279,7 @@ function writer.make_rock_manifest(name, version)
279end 279end
280 280
281-- Writes a 'rock_namespace' file in a locally installed rock directory. 281-- Writes a 'rock_namespace' file in a locally installed rock directory.
282-- @param name string: the rock name (may be in user/rock format) 282-- @param name string: the rock name, without a namespace
283-- @param version string: the rock version 283-- @param version string: the rock version
284-- @param namespace string?: the namespace 284-- @param namespace string?: the namespace
285-- @return true if successful (or unnecessary, if there is no namespace), 285-- @return true if successful (or unnecessary, if there is no namespace),
@@ -288,8 +288,6 @@ function writer.make_namespace_file(name, version, namespace)
288 assert(type(name) == "string" and not name:match("/")) 288 assert(type(name) == "string" and not name:match("/"))
289 assert(type(version) == "string") 289 assert(type(version) == "string")
290 assert(type(namespace) == "string" or not namespace) 290 assert(type(namespace) == "string" or not namespace)
291 name = util.adjust_name_and_namespace(name, { namespace = namespace })
292 name, namespace = util.split_namespace(name)
293 if not namespace then 291 if not namespace then
294 return true 292 return true
295 end 293 end