diff options
| -rw-r--r-- | src/pkgcore/ebuild/portage_conf.py | 2 | ||||
| -rw-r--r-- | src/pkgcore/repository/multiplex.py | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/pkgcore/ebuild/portage_conf.py b/src/pkgcore/ebuild/portage_conf.py index ef25baab3..d33d2e37d 100644 --- a/src/pkgcore/ebuild/portage_conf.py +++ b/src/pkgcore/ebuild/portage_conf.py @@ -216,7 +216,7 @@ class PortageConfig(DictMixin): self["repo-stack"] = basics.FakeIncrementalDictConfigSection( my_convert_hybrid, { - "class": "pkgcore.repository.multiplex.config_tree", + "class": "pkgcore.repository.multiplex.tree", "repos": tuple(repos), }, ) diff --git a/src/pkgcore/repository/multiplex.py b/src/pkgcore/repository/multiplex.py index d4dcf206a..e46799939 100644 --- a/src/pkgcore/repository/multiplex.py +++ b/src/pkgcore/repository/multiplex.py @@ -14,7 +14,7 @@ from snakeoil.compatibility import sorted_cmp from snakeoil.currying import post_curry from snakeoil.iterables import iter_sort -from ..config.hint import configurable +from ..config.hint import ConfigHint from ..operations import repo as repo_interface from . import errors, prototype @@ -62,11 +62,6 @@ class operations(repo_interface.operations_proxy): return ret -@configurable(types={"repos": "refs:repo"}, typename="repo") -def config_tree(repos): - return tree(*repos) - - class tree(prototype.tree): """Repository combining multiple repos together. @@ -84,6 +79,8 @@ class tree(prototype.tree): frozen_settable = False operations_kls = operations + pkgcore_config_type = ConfigHint(types={"repos": "refs:repo"}, typename="repo") + def __init__(self, *trees): super().__init__() for x in trees: |