* [gentoo-commits] proj/pkgcore/pkgcore:master commit in: src/pkgcore/merge/, src/pkgcore/plugins/
@ 2022-12-18 19:01 Arthur Zamarin
0 siblings, 0 replies; only message in thread
From: Arthur Zamarin @ 2022-12-18 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 76c71bcd13917e96e6937481d774a51bf3ebf82b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 2 09:46:46 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 18:58:27 2022 +0000
URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=76c71bcd
remove pkgcore_triggers plugins
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
src/pkgcore/merge/engine.py | 7 +++----
src/pkgcore/merge/triggers.py | 9 +++++++++
src/pkgcore/plugins/pkgcore_triggers.py | 14 --------------
3 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/pkgcore/merge/engine.py b/src/pkgcore/merge/engine.py
index 99009b27e..e3ebf7ade 100644
--- a/src/pkgcore/merge/engine.py
+++ b/src/pkgcore/merge/engine.py
@@ -27,9 +27,9 @@ from snakeoil.osutils import normpath
from ..fs import contents, livefs
from ..operations import observer as observer_mod
-from ..plugin import get_plugins
from . import errors
from .const import INSTALL_MODE, REPLACE_MODE, UNINSTALL_MODE
+from .triggers import default_plugins_triggers
def alias_cset(alias, engine, csets):
@@ -118,9 +118,8 @@ class MergeEngine:
if not disable_plugins:
# merge in default triggers first.
- for trigger in get_plugins('triggers'):
- t = trigger()
- t.register(self)
+ for trigger in default_plugins_triggers():
+ trigger().register(self)
# merge in overrides
for hook, triggers in hooks.items():
diff --git a/src/pkgcore/merge/triggers.py b/src/pkgcore/merge/triggers.py
index bfab54aeb..41ffcfa08 100644
--- a/src/pkgcore/merge/triggers.py
+++ b/src/pkgcore/merge/triggers.py
@@ -868,3 +868,12 @@ class BinaryDebug(ThreadedTrigger):
self._modified.difference_update(cset)
cset.update(self._modified)
del self._modified
+
+
+def default_plugins_triggers() -> tuple[type[base]]:
+ triggers = (
+ ldconfig, merge, unmerge,
+ fix_uid_perms, fix_gid_perms, fix_set_bits, detect_world_writable,
+ InfoRegen, CommonDirectoryModes, BaseSystemUnmergeProtection,
+ )
+ return tuple(sorted(triggers, reverse=True, key=lambda x: (x.priority, x.__name__)))
diff --git a/src/pkgcore/plugins/pkgcore_triggers.py b/src/pkgcore/plugins/pkgcore_triggers.py
deleted file mode 100644
index 608033ef6..000000000
--- a/src/pkgcore/plugins/pkgcore_triggers.py
+++ /dev/null
@@ -1,14 +0,0 @@
-pkgcore_plugins = {
- 'triggers': [f'pkgcore.merge.triggers.{x}' for x in [
- 'ldconfig',
- 'merge',
- 'unmerge',
- 'fix_uid_perms',
- 'fix_gid_perms',
- 'fix_set_bits',
- 'detect_world_writable',
- 'InfoRegen',
- 'CommonDirectoryModes',
- 'BaseSystemUnmergeProtection',
- ]],
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-12-18 19:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-18 19:01 [gentoo-commits] proj/pkgcore/pkgcore:master commit in: src/pkgcore/merge/, src/pkgcore/plugins/ Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox