From 42e1e4b181a5f47183131d30590afd8de2968895 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Fri, 30 Aug 2013 19:42:38 -0300 Subject: Make LR stop complaining when the 'doc' directory is missing. Also, handle missing directories explicitly specified in copy_directories as errors. Closes #142. --- src/luarocks/build.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua index 49bcefab..5555d94a 100644 --- a/src/luarocks/build.lua +++ b/src/luarocks/build.lua @@ -243,7 +243,12 @@ function build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_mode) end end - local copy_directories = build.copy_directories or {"doc"} + local copy_directories = build.copy_directories + local copying_default = false + if not copy_directories then + copy_directories = {"doc"} + copying_default = true + end for _, copy_dir in pairs(copy_directories) do if fs.is_dir(copy_dir) then @@ -251,7 +256,9 @@ function build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_mode) fs.make_dir(dest) fs.copy_contents(copy_dir, dest) else - util.warning("Directory '"..copy_dir.."' not found") + if not copying_default then + return nil, "Directory '"..copy_dir.."' not found" + end end end -- cgit v1.2.3-55-g6feb