commit: 0f4d7985cd76847dc8aa4d158328c9f4680914ac Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sat Nov 22 09:33:02 2025 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu Nov 27 05:16:22 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0f4d7985
sync.py: Replace lazyimport with function local import Bug: https://bugs.gentoo.org/951146 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/emaint/modules/sync/sync.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/portage/emaint/modules/sync/sync.py b/lib/portage/emaint/modules/sync/sync.py index ac0b41cb73..bec34085d5 100644 --- a/lib/portage/emaint/modules/sync/sync.py +++ b/lib/portage/emaint/modules/sync/sync.py @@ -1,4 +1,4 @@ -# Copyright 2014-2020 Gentoo Authors +# Copyright 2014-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import os @@ -18,15 +18,6 @@ from portage.util._async.AsyncScheduler import AsyncScheduler import _emerge from _emerge.emergelog import emergelog - -portage.proxy.lazyimport.lazyimport( - globals(), - "_emerge.actions:adjust_configs,load_emerge_config", - "_emerge.chk_updated_cfg_files:chk_updated_cfg_files", - "_emerge.main:parse_opts", - "_emerge.post_emerge:display_news_notification", -) - warn = create_color_func("WARN") @@ -46,6 +37,9 @@ class SyncRepos: @param emerge_config: optional an emerge_config instance to use @param emerge_logging: boolean, defaults to False """ + from _emerge.main import parse_opts + from _emerge.actions import load_emerge_config + if emerge_config is None: # need a basic options instance actions, opts, _files = parse_opts([], silent=True) @@ -201,6 +195,8 @@ class SyncRepos: return selected def _sync(self, selected_repos, return_messages, emaint_opts=None): + from _emerge.post_emerge import display_news_notification + msgs = [] if not selected_repos: if return_messages: @@ -290,6 +286,8 @@ class SyncRepos: self._reload_config() def _check_updates(self): + from _emerge.chk_updated_cfg_files import chk_updated_cfg_files + mybestpv = self.emerge_config.target_config.trees["porttree"].dbapi.xmatch( "bestmatch-visible", portage.const.PORTAGE_PACKAGE_ATOM ) @@ -359,6 +357,8 @@ class SyncRepos: def _reload_config(self): """Reload the whole config from scratch.""" + from _emerge.actions import load_emerge_config, adjust_configs + load_emerge_config(emerge_config=self.emerge_config) adjust_configs(self.emerge_config.opts, self.emerge_config.trees)
