diff options
author | V1K1NGbg <victor@ilchev.com> | 2024-08-06 20:15:06 +0300 |
---|---|---|
committer | V1K1NGbg <victor@ilchev.com> | 2024-08-06 20:15:06 +0300 |
commit | 2b553013c302a84a8f76ca093fda89e6f4e54432 (patch) | |
tree | 3fdb8d7b71d7ef858d40b065262d8d38e0995b63 | |
parent | 21fc7586bf967f18df9589449a6cf58850b6492f (diff) | |
download | luarocks-2b553013c302a84a8f76ca093fda89e6f4e54432.tar.gz luarocks-2b553013c302a84a8f76ca093fda89e6f4e54432.tar.bz2 luarocks-2b553013c302a84a8f76ca093fda89e6f4e54432.zip |
deps
-rw-r--r-- | src/luarocks/deps.lua | 3 | ||||
-rw-r--r-- | src/luarocks/deps.tl | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index 1d4fcd0a..df2fbbd5 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua | |||
@@ -55,7 +55,6 @@ local deplocks = require("luarocks.deplocks") | |||
55 | 55 | ||
56 | 56 | ||
57 | 57 | ||
58 | |||
59 | local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set) | 58 | local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set) |
60 | 59 | ||
61 | return function(dep) | 60 | return function(dep) |
@@ -697,7 +696,7 @@ function deps.scan_deps(results, mdeps, name, version, deps_mode) | |||
697 | if not rockspec then | 696 | if not rockspec then |
698 | return | 697 | return |
699 | end | 698 | end |
700 | dependencies = rockspec.dependencies | 699 | dependencies = rockspec.dependencies.queries |
701 | rocks_provided = rockspec.rocks_provided | 700 | rocks_provided = rockspec.rocks_provided |
702 | mdn[version] = dependencies | 701 | mdn[version] = dependencies |
703 | else | 702 | else |
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl index 482133bb..dca855eb 100644 --- a/src/luarocks/deps.tl +++ b/src/luarocks/deps.tl | |||
@@ -17,7 +17,6 @@ local type r = require("luarocks.core.types.rockspec") | |||
17 | local type Rockspec = r.Rockspec | 17 | local type Rockspec = r.Rockspec |
18 | local type Build = r.Build | 18 | local type Build = r.Build |
19 | local type ExternalDependencies = r.ExternalDependencies | 19 | local type ExternalDependencies = r.ExternalDependencies |
20 | local type Dependencies = r.Dependencies | ||
21 | local type Variables = r.Variables | 20 | local type Variables = r.Variables |
22 | 21 | ||
23 | local type t = require("luarocks.core.types.tree") | 22 | local type t = require("luarocks.core.types.tree") |
@@ -678,7 +677,7 @@ end | |||
678 | -- @param mdeps table: The manifest dependencies table. | 677 | -- @param mdeps table: The manifest dependencies table. |
679 | -- @param name string: Package name. | 678 | -- @param name string: Package name. |
680 | -- @param version string: Package version. | 679 | -- @param version string: Package version. |
681 | function deps.scan_deps(results: {string: string}, mdeps: {string: {string: Dependencies}}, name: string, version: string, deps_mode: string) | 680 | function deps.scan_deps(results: {string: string}, mdeps: {string: {string: {Query}}}, name: string, version: string, deps_mode: string) |
682 | assert(type(results) == "table") | 681 | assert(type(results) == "table") |
683 | assert(type(mdeps) == "table") | 682 | assert(type(mdeps) == "table") |
684 | assert(not name:match("/")) | 683 | assert(not name:match("/")) |
@@ -697,7 +696,7 @@ function deps.scan_deps(results: {string: string}, mdeps: {string: {string: Depe | |||
697 | if not rockspec then | 696 | if not rockspec then |
698 | return | 697 | return |
699 | end | 698 | end |
700 | dependencies = rockspec.dependencies | 699 | dependencies = rockspec.dependencies.queries |
701 | rocks_provided = rockspec.rocks_provided | 700 | rocks_provided = rockspec.rocks_provided |
702 | mdn[version] = dependencies | 701 | mdn[version] = dependencies |
703 | else | 702 | else |