diff options
| author | hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c> | 2009-10-21 12:49:48 +0000 |
|---|---|---|
| committer | hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c> | 2009-10-21 12:49:48 +0000 |
| commit | a2784867f6629ca24913eba779df125f588d90ac (patch) | |
| tree | d5d0db462b7b43cfaa05c5160c18933bb7f6e5fa /src | |
| parent | 781f566a466a5bf380fee21ffdb2438aa62b9835 (diff) | |
| download | luarocks-a2784867f6629ca24913eba779df125f588d90ac.tar.gz luarocks-a2784867f6629ca24913eba779df125f588d90ac.tar.bz2 luarocks-a2784867f6629ca24913eba779df125f588d90ac.zip | |
fix compatibility with LR1 packages. Bug reported by Graham Wakefield.
git-svn-id: http://luarocks.org/svn/luarocks/trunk@104 9ca3f7c1-7366-0410-b1a3-b5c78f85698c
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/install.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua index 8e8b5f6b..76793a3f 100644 --- a/src/luarocks/install.lua +++ b/src/luarocks/install.lua | |||
| @@ -55,15 +55,15 @@ function install_binary_rock(rock_file) | |||
| 55 | ok, err, errcode = deps.check_external_deps(rockspec, "install") | 55 | ok, err, errcode = deps.check_external_deps(rockspec, "install") |
| 56 | if err then return nil, err, errcode end | 56 | if err then return nil, err, errcode end |
| 57 | 57 | ||
| 58 | ok, err, errcode = deps.fulfill_dependencies(rockspec) | ||
| 59 | if err then return nil, err, errcode end | ||
| 60 | |||
| 61 | -- For compatibility with .rock files built with LuaRocks 1 | 58 | -- For compatibility with .rock files built with LuaRocks 1 |
| 62 | if not fs.exists(path.rock_manifest_file(name, version)) then | 59 | if not fs.exists(path.rock_manifest_file(name, version)) then |
| 63 | ok, err = manif.make_rock_manifest(name, version) | 60 | ok, err = manif.make_rock_manifest(name, version) |
| 64 | if err then return nil, err end | 61 | if err then return nil, err end |
| 65 | end | 62 | end |
| 66 | 63 | ||
| 64 | ok, err, errcode = deps.fulfill_dependencies(rockspec) | ||
| 65 | if err then return nil, err, errcode end | ||
| 66 | |||
| 67 | ok, err = rep.deploy_files(name, version) | 67 | ok, err = rep.deploy_files(name, version) |
| 68 | if err then return nil, err end | 68 | if err then return nil, err end |
| 69 | 69 | ||