diff options
author | Hisham <hisham@gobolinux.org> | 2016-07-11 01:15:10 -0300 |
---|---|---|
committer | Hisham <hisham@gobolinux.org> | 2016-07-11 01:15:10 -0300 |
commit | 41eccd4ca6fe51f8174dd43744e7a4bab4daf2cb (patch) | |
tree | 4616ef541f9005f123ca873942a2fe9cee5cb81c | |
parent | fa60a09a3a522f9f3b58f084ab8efdb35a04e7df (diff) | |
download | luarocks-41eccd4ca6fe51f8174dd43744e7a4bab4daf2cb.tar.gz luarocks-41eccd4ca6fe51f8174dd43744e7a4bab4daf2cb.tar.bz2 luarocks-41eccd4ca6fe51f8174dd43744e7a4bab4daf2cb.zip |
Fix crash when given a remote rockspec.
-rw-r--r-- | src/luarocks/new_version.lua | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/luarocks/new_version.lua b/src/luarocks/new_version.lua index bd73e308..8fc00a86 100644 --- a/src/luarocks/new_version.lua +++ b/src/luarocks/new_version.lua | |||
@@ -134,15 +134,19 @@ function new_version.command(flags, input, version, url) | |||
134 | end | 134 | end |
135 | assert(type(input) == "string") | 135 | assert(type(input) == "string") |
136 | 136 | ||
137 | local filename = input | 137 | local filename, err |
138 | if not input:match("rockspec$") then | 138 | if input:match("rockspec$") then |
139 | local err | 139 | filename, err = fetch.fetch_url(input) |
140 | if not filename then | ||
141 | return nil, err | ||
142 | end | ||
143 | else | ||
140 | filename, err = download.download("rockspec", input) | 144 | filename, err = download.download("rockspec", input) |
141 | if not filename then | 145 | if not filename then |
142 | return nil, err | 146 | return nil, err |
143 | end | 147 | end |
144 | end | 148 | end |
145 | 149 | ||
146 | local valid_rs, err = fetch.load_rockspec(filename) | 150 | local valid_rs, err = fetch.load_rockspec(filename) |
147 | if not valid_rs then | 151 | if not valid_rs then |
148 | return nil, err | 152 | return nil, err |
@@ -168,7 +172,7 @@ function new_version.command(flags, input, version, url) | |||
168 | end | 172 | end |
169 | local new_rockver = new_ver:gsub("-", "") | 173 | local new_rockver = new_ver:gsub("-", "") |
170 | 174 | ||
171 | local out_rs = persist.load_into_table(filename) | 175 | local out_rs, err = persist.load_into_table(filename) |
172 | local out_name = out_rs.package:lower() | 176 | local out_name = out_rs.package:lower() |
173 | out_rs.version = new_rockver.."-"..new_rev | 177 | out_rs.version = new_rockver.."-"..new_rev |
174 | 178 | ||