aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c>2009-04-25 23:10:17 +0000
committerhisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c>2009-04-25 23:10:17 +0000
commit50e6776d56a48be9bcd8118bce3843e54f04d04a (patch)
tree0c868f15c1b6be37c5a76324fe0d2cf7d87cf457 /src
parent9eb905efe2fdae188a5d6a17b979123ad524c7bc (diff)
downloadluarocks-50e6776d56a48be9bcd8118bce3843e54f04d04a.tar.gz
luarocks-50e6776d56a48be9bcd8118bce3843e54f04d04a.tar.bz2
luarocks-50e6776d56a48be9bcd8118bce3843e54f04d04a.zip
fix, to handle abstracted split_url now in dir module
git-svn-id: http://luarocks.org/svn/luarocks/trunk@15 9ca3f7c1-7366-0410-b1a3-b5c78f85698c
Diffstat (limited to 'src')
-rw-r--r--src/luarocks/fetch.lua5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index 57e641cf..9d65e6e8 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -59,7 +59,7 @@ function fetch_url_at_temp_dir(url, tmpname, filename)
59 59
60 local protocol, pathname = dir.split_url(url) 60 local protocol, pathname = dir.split_url(url)
61 if protocol == "file" then 61 if protocol == "file" then
62 return pathname, dir.dir_name(pathname) 62 return pathname, dir.dir_name(fs.absolute_name(pathname))
63 else 63 else
64 local temp_dir = fs.make_temp_dir(tmpname) 64 local temp_dir = fs.make_temp_dir(tmpname)
65 if not temp_dir then 65 if not temp_dir then
@@ -122,8 +122,7 @@ end
122-- or nil followed by an error message. 122-- or nil followed by an error message.
123function load_local_rockspec(filename) 123function load_local_rockspec(filename)
124 assert(type(filename) == "string") 124 assert(type(filename) == "string")
125 125 local rockspec, err = persist.load_into_table(fs.absolute_name(filename))
126 local rockspec, err = persist.load_into_table(filename)
127 if not rockspec then 126 if not rockspec then
128 return nil, "Could not load rockspec file "..filename.." ("..err..")" 127 return nil, "Could not load rockspec file "..filename.." ("..err..")"
129 end 128 end