From 5af3344ced5dae1396b0d4d5e51481863621b2dc Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Wed, 13 Nov 2024 21:09:49 +0100 Subject: Fix repository path with nonempty ROOT in profile module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * modules/profile.eselect (get_repo_path): Prefix the portageq output with ROOT. Bug 942970. Bug: https://bugs.gentoo.org/942970 Signed-off-by: Ulrich Müller --- ChangeLog | 3 +++ modules/profile.eselect | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5764686..861ec10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2024-11-13 Ulrich Müller + * modules/profile.eselect (get_repo_path): Prefix the portageq + output with ROOT. Bug 942970. + * modules/profile.eselect (get_symlink_location): Warn about deprecated /etc/make.profile location. diff --git a/modules/profile.eselect b/modules/profile.eselect index 8c74dd9..e6f34ac 100644 --- a/modules/profile.eselect +++ b/modules/profile.eselect @@ -40,7 +40,10 @@ get_repos() { # get paths for a given list of repositories get_repo_path() { - portageq get_repo_path "${EROOT:-/}" "$@" + local path + portageq get_repo_path "${EROOT:-/}" "$@" \ + | while read path; do printf "%s\n" "${ROOT}${path}"; done + [[ "${PIPESTATUS[*]}" = "0 0" ]] } # get a list of valid profiles -- cgit v1.2.3-65-gdbad