From 011ada7a1db5b03cdfc798eed18f1bdffa7ad386 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 9 Dec 2011 11:15:20 -0800 Subject: [PATCH] libs/package-manager.bash.in: portageq uses EROOT This fixes `eselect news` for compatibility with >=sys-apps/portage-2.2.01.19833 (prefix branch), as well as mainline portage when installed in a prefix, as discussed here: http://archives.gentoo.org/gentoo-alt/msg_4097bbff93bb737f2976d60facb67dc9.xml Also, note that following commit will also have to be applied to prefix portage-2.2.01.19833 in order to make this work correctly: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=174ffd8336ec9914f85f871b7ce78506574d3d9b --- libs/package-manager.bash.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/package-manager.bash.in b/libs/package-manager.bash.in index 3b2a168..f6a8d43 100644 --- a/libs/package-manager.bash.in +++ b/libs/package-manager.bash.in @@ -107,7 +107,7 @@ envvar() { best_version() { [[ $# -eq 1 ]] || die "best_version expects exactly one argument" case $(package_manager) in - portage) portageq best_version "${ROOT:-/}" "$1" ;; + portage) portageq best_version "${EROOT}" "$1" ;; pkgcore) pinspect portageq best_version "${ROOT:-/}" "$1" ;; paludis) run_paludis print-best-version --format name-version "$1" ;; esac @@ -118,7 +118,7 @@ best_version() { has_version() { [[ $# -eq 1 ]] || die "has_version expects exactly one argument" case $(package_manager) in - portage) portageq has_version "${ROOT:-/}" "$1" ;; + portage) portageq has_version "${EROOT}" "$1" ;; pkgcore) pinspect portageq has_version "${ROOT:-/}" "$1" ;; paludis) run_paludis has-version "$1" ;; esac @@ -128,7 +128,7 @@ has_version() { # return list of repositories known to the package manager get_repositories() { case $(package_manager) in - portage) portageq get_repos "${ROOT:-/}" ;; + portage) portageq get_repos "${EROOT}" ;; pkgcore) pinspect portageq get_repositories ;; paludis) run_paludis print-repositories ;; esac @@ -141,7 +141,7 @@ get_repo_news_dir() { local repo=$1 case $(package_manager) in portage) echo "$(portageq get_repo_path \ - "${ROOT:-/}" "${repo}")/metadata/news" ;; + "${EROOT}" "${repo}")/metadata/news" ;; pkgcore) pinspect portageq get_repo_news_path "${repo}" ;; paludis) run_paludis print-repository-metadata ${repo} \ --raw-name newsdir --format '%v\n' ;; -- 1.7.8.rc4