proj/portage:master commit in: lib/portage/util/, lib/_emerge/
"Matt Turner" <[email protected]>
| Newsgroups | gmane.linux.gentoo.cvs |
|---|---|
| Message-ID | <1786672793.9b3bd47bd36420a90c7c709d4dd8cda5b109a2ee.mattst88@gentoo> |
commit: 9b3bd47bd36420a90c7c709d4dd8cda5b109a2ee
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 22:35:56 2026 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 01:59:53 2026 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9b3bd47b
cgroup: demote the "using <root>" message to debug
It reads like leftover debugging output and tells the user nothing that
PORTAGE_CGROUP_ROOT does not already say, so it does not deserve to be
printed under --verbose. It is still useful when working on this code,
so keep it as a _debug() message.
It was the only use of both CgroupManager's verbose parameter and the
_info() helper, so drop those.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
lib/_emerge/Scheduler.py | 5 +----
lib/portage/util/cgroup.py | 10 ++--------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py
index 73e93b4ac..15aed305a 100644
--- a/lib/_emerge/Scheduler.py
+++ b/lib/_emerge/Scheduler.py
@@ -233,10 +233,7 @@ class Scheduler(PollScheduler):
self._observability = ObservabilityMonitor(self)
self._cgroup = None
if "cgroup" in settings.features:
- cg = CgroupManager(
- settings.get("PORTAGE_CGROUP_ROOT", DEFAULT_CGROUP_ROOT),
- verbose="--verbose" in myopts,
- )
+ cg = CgroupManager(settings.get("PORTAGE_CGROUP_ROOT", DEFAULT_CGROUP_ROOT))
if cg.setup():
self._cgroup = cg
settings.unlock()
diff --git a/lib/portage/util/cgroup.py b/lib/portage/util/cgroup.py
index 23016b5c4..ec1911f89 100644
--- a/lib/portage/util/cgroup.py
+++ b/lib/portage/util/cgroup.py
@@ -59,10 +59,6 @@ def _warn(msg: str) -> None:
writemsg_level(f"!!! cgroup: {msg}\n", level=logging.WARNING, noiselevel=-1)
-def _info(msg: str) -> None:
- writemsg_level(f"cgroup: {msg}\n", level=logging.INFO)
-
-
def _debug(msg: str) -> None:
writemsg_level(f"cgroup: {msg}\n", level=logging.DEBUG, noiselevel=2)
@@ -453,19 +449,17 @@ class CgroupManager:
via settings.
"""
- def __init__(self, root: str = DEFAULT_CGROUP_ROOT, verbose: bool = False) -> None:
+ def __init__(self, root: str = DEFAULT_CGROUP_ROOT) -> None:
self.root = root
self.emerge_root = os.path.join(root, f"emerge-{os.getpid()}")
self.enabled = False
- self.verbose = verbose
self._seen: set[str] = set()
def setup(self) -> bool:
"""Initialize the base and per-emerge cgroups. Sets self.enabled."""
if not ensure_base(self.root):
return False
- if self.verbose:
- _info(f"using {self.root}")
+ _debug(f"using {self.root}")
cleanup_stale(self.root)
try:
os.makedirs(self.emerge_root, exist_ok=True)