Commit b00787f2 authored by Karel Koci's avatar Karel Koci 🤘

Remove group variable from package candidate

This variable was pointer to package group from candidate. But we
always access candidate from package group and if we manipulate with
candidate directly we can access group trough Package field.
parent 71ce6282
......@@ -261,7 +261,6 @@ function pkg_aggregate()
available_packages[pkg.name] = {candidates = {}, modifiers = {}}
end
local pkg_group = available_packages[pkg.name]
utils.private(pkg).group = pkg_group
if pkg.virtual then
table.insert(pkg_group.candidates, pkg)
pkg_group.virtual = true
......
......@@ -48,7 +48,6 @@ function test_no_deps()
package = {
tp = 'package',
name = 'pkg1',
group = pkgs.pkg1
}
},
{
......@@ -214,7 +213,6 @@ function test_deps()
package = {
tp = 'package',
name = 'pkg1',
group = pkgs.pkg1
}
},
{
......@@ -222,7 +220,6 @@ function test_deps()
package = {
tp = 'package',
name = 'pkg2',
group = pkgs.pkg2
}
}
}
......@@ -282,7 +279,6 @@ function test_missing_dep()
package = {
tp = 'package',
name = 'pkg',
group = pkgs.pkg
}
}
}
......@@ -935,7 +931,6 @@ function test_missing_install()
package = {
tp = 'package',
name = 'pkg1',
group = pkgs.pkg1
}
},
{
......@@ -975,7 +970,6 @@ function test_missing_dep_ignore()
package = {
tp = 'package',
name = 'pkg1',
group = pkgs.pkg1
}
}
}
......@@ -1006,7 +1000,6 @@ function test_complex_deps()
local pkg2 = {
tp = "package",
name = "pkg2",
group = pkgs.pkg2
}
pkgs.meta = {
candidates = {{Package = "meta", repo = def_repo}},
......@@ -1047,7 +1040,6 @@ function test_complex_deps()
package = {
tp = 'package',
name = 'meta',
group = pkgs.meta
}
}
}
......
......@@ -300,7 +300,6 @@ function test_pkg_merge()
end
end
assert_table_equal(exp, postprocess.available_packages)
assert_table_equal(utils.private(postprocess.available_packages.virt.candidates[1]).group, exp.virt)
end
function test_deps_canon()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment