diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2015-03-23 22:30:12 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-03-23 22:30:12 -0300 |
commit | 68aa7aef29000099ab1dfebe92052e693fe18d64 (patch) | |
tree | e223d214598411aa74731f1a55878be2b83f23c9 /src | |
parent | e869c098d7432d039d3bdddd3f24ef9d20522a2f (diff) | |
parent | ae51a3c726366c635bda06f2efa0cab47f9ceeaf (diff) | |
download | luarocks-68aa7aef29000099ab1dfebe92052e693fe18d64.tar.gz luarocks-68aa7aef29000099ab1dfebe92052e693fe18d64.tar.bz2 luarocks-68aa7aef29000099ab1dfebe92052e693fe18d64.zip |
Merge branch 'master' of https://github.com/keplerproject/luarocks
Diffstat (limited to 'src')
-rw-r--r-- | src/luarocks/fetch.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua index 980c8fe2..497ae84f 100644 --- a/src/luarocks/fetch.lua +++ b/src/luarocks/fetch.lua | |||
@@ -319,9 +319,10 @@ function fetch.get_sources(rockspec, extract, dest_dir) | |||
319 | local url = rockspec.source.url | 319 | local url = rockspec.source.url |
320 | local name = rockspec.name.."-"..rockspec.version | 320 | local name = rockspec.name.."-"..rockspec.version |
321 | local filename = rockspec.source.file | 321 | local filename = rockspec.source.file |
322 | local source_file, store_dir, err, errcode | 322 | local source_file, store_dir |
323 | local ok, err, errcode | ||
323 | if dest_dir then | 324 | if dest_dir then |
324 | local ok, err = fs.change_dir(dest_dir) | 325 | ok, err = fs.change_dir(dest_dir) |
325 | if not ok then return nil, err, "dest_dir" end | 326 | if not ok then return nil, err, "dest_dir" end |
326 | source_file, err, errcode = fetch.fetch_url(url, filename) | 327 | source_file, err, errcode = fetch.fetch_url(url, filename) |
327 | fs.pop_dir() | 328 | fs.pop_dir() |