diff options
| author | Thijs Schreijer <thijs@thijsschreijer.nl> | 2013-04-12 11:22:29 -0700 |
|---|---|---|
| committer | Thijs Schreijer <thijs@thijsschreijer.nl> | 2013-04-12 11:22:29 -0700 |
| commit | 8409f4d5ef0dab24abe29628c77e552ebba5e7f4 (patch) | |
| tree | 35e518fa64884358fb7d2c3395d40bfd7a34e40b | |
| parent | dede5ff5a56eb1d2ddb13ca7450e00cd8d6562dd (diff) | |
| parent | 5576f7a93a1e2eeb268dff0b30f786a086966837 (diff) | |
| download | luarocks-8409f4d5ef0dab24abe29628c77e552ebba5e7f4.tar.gz luarocks-8409f4d5ef0dab24abe29628c77e552ebba5e7f4.tar.bz2 luarocks-8409f4d5ef0dab24abe29628c77e552ebba5e7f4.zip | |
Merge pull request #120 from Tieske/fix_failed_compilation_not_aborted
bug in builtin.lua that caused a previous "ok=false" to be reset in a la...
| -rw-r--r-- | src/luarocks/build/builtin.lua | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua index 853b0361..96ce35a6 100644 --- a/src/luarocks/build/builtin.lua +++ b/src/luarocks/build/builtin.lua | |||
| @@ -230,12 +230,14 @@ function run(rockspec) | |||
| 230 | end | 230 | end |
| 231 | end | 231 | end |
| 232 | end | 232 | end |
| 233 | for name, dest in pairs(built_modules) do | 233 | if ok then |
| 234 | fs.make_dir(dest) | 234 | for name, dest in pairs(built_modules) do |
| 235 | ok = fs.copy(name, dest) | 235 | fs.make_dir(dest) |
| 236 | if not ok then | 236 | ok = fs.copy(name, dest) |
| 237 | err = "Failed installing "..name.." in "..dest | 237 | if not ok then |
| 238 | break | 238 | err = "Failed installing "..name.." in "..dest |
| 239 | break | ||
| 240 | end | ||
| 239 | end | 241 | end |
| 240 | end | 242 | end |
| 241 | if ok then | 243 | if ok then |