diff options
| author |   Sam James <sam@gentoo.org> | 2023-07-25 04:19:14 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-07-26 08:58:31 +0100 |
| commit | a777662890a7552927ee794506a92ddffc43523e (patch) | |
| tree | d86121a1c612b338f7111f1dc462eea278fbef53 | |
| parent | lib: env_update: port to subprocess (diff) | |
| download | portage-a7776628.tar.gz portage-a7776628.tar.bz2 portage-a7776628.zip | |
lib: env_update: use more f-strings
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | lib/portage/util/env_update.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/portage/util/env_update.py b/lib/portage/util/env_update.py index a7015669e..9d3b5bb25 100644 --- a/lib/portage/util/env_update.py +++ b/lib/portage/util/env_update.py @@ -361,19 +361,17 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, writemsg_lev # an older package installed ON TOP of a newer version will cause ldconfig # to overwrite the symlinks we just made. -X means no links. After 'clean' # we can safely create links. - writemsg_level( - _(">>> Regenerating %setc/ld.so.cache...\n") % (target_root,) - ) + writemsg_level(_(f">>> Regenerating {target_root}etc/ld.so.cache...\n")) ret = subprocess.run( - [f"{ldconfig}", "-X", "-r", f"{target_root}"], cwd="/" + [ldconfig, "-X", "-r", target_root], cwd="/" ).returncode elif ostype in ("FreeBSD", "DragonFly"): writemsg_level( - _(">>> Regenerating %svar/run/ld-elf.so.hints...\n") % target_root + _(f">>> Regenerating {target_root}var/run/ld-elf.so.hints...\n") ) ret = subprocess.run( [ - f"{ldconfig}", + ldconfig, "-elf", "-i", "-f", |