aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2012-05-24 18:12:01 -0300
committerHisham Muhammad <hisham@gobolinux.org>2012-05-24 18:19:13 -0300
commit96e72c4a8782d62dc3fb53ad60fdcf7cb39418c1 (patch)
tree736bef48f29425d06e61c3c26f69405005fd0d15
parenta9baf450ed66e3cd112c5f93f78c4f277328790b (diff)
downloadluarocks-96e72c4a8782d62dc3fb53ad60fdcf7cb39418c1.tar.gz
luarocks-96e72c4a8782d62dc3fb53ad60fdcf7cb39418c1.tar.bz2
luarocks-96e72c4a8782d62dc3fb53ad60fdcf7cb39418c1.zip
Do not lose error message information on 'unpack'.
-rw-r--r--rockspec2
-rw-r--r--src/luarocks/unpack.lua4
2 files changed, 3 insertions, 3 deletions
diff --git a/rockspec b/rockspec
index 1798e8e0..d8718efd 100644
--- a/rockspec
+++ b/rockspec
@@ -1,5 +1,5 @@
1package = "LuaRocks" 1package = "LuaRocks"
2local VER = "scm" 2local VER = "2.0.9"
3local REV = "1" 3local REV = "1"
4version = VER.."-"..REV 4version = VER.."-"..REV
5 5
diff --git a/src/luarocks/unpack.lua b/src/luarocks/unpack.lua
index 6ea7353d..4920d381 100644
--- a/src/luarocks/unpack.lua
+++ b/src/luarocks/unpack.lua
@@ -27,9 +27,9 @@ local function unpack_rockspec(rockspec_file, dir_name)
27 assert(type(rockspec_file) == "string") 27 assert(type(rockspec_file) == "string")
28 assert(type(dir_name) == "string") 28 assert(type(dir_name) == "string")
29 29
30 local rockspec = fetch.load_rockspec(rockspec_file) 30 local rockspec, err = fetch.load_rockspec(rockspec_file)
31 if not rockspec then 31 if not rockspec then
32 return nil, "Failed loading rockspec "..rockspec_file 32 return nil, "Failed loading rockspec "..rockspec_file..": "..err
33 end 33 end
34 fs.change_dir(dir_name) 34 fs.change_dir(dir_name)
35 local ok, sources_dir = fetch.fetch_sources(rockspec, true, ".") 35 local ok, sources_dir = fetch.fetch_sources(rockspec, true, ".")