diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2014-11-17 08:57:23 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2014-11-17 09:41:15 -0800 |
| commit | 77c4a4d2cb63d8e7c95840c44f5bf9b597316120 (patch) | |
| tree | 3c76789c108ad89169459ffccbb9ba6d580d02fa /bin/portageq | |
| parent | unprivileged mode: use first_existing helper func (diff) | |
| download | portage-77c4a4d2cb63d8e7c95840c44f5bf9b597316120.tar.gz portage-77c4a4d2cb63d8e7c95840c44f5bf9b597316120.tar.bz2 portage-77c4a4d2cb63d8e7c95840c44f5bf9b597316120.zip | |
unprivileged mode: fix cross-prefix support
In commit 1364fcd89384c9f60e6d72d7057dc00d8caba175, EROOT calculation
in portage.data did not account for cross-prefix support. This is
fixed by using new _target_root and _target_eprefix functions to
perform the calculation. The _target_eprefix function is also useful
in portageq, where the target EPREFIX needs to be known before
portage.settings is instantiated.
Fixes 1364fcd89384 ("Support unprivileged mode for bug #433453.")
Acked-by: Brian Dolbec <dolsen@gentoo.org>
Diffstat (limited to 'bin/portageq')
| -rwxr-xr-x | bin/portageq | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/bin/portageq b/bin/portageq index ef565d19e..6a42bfd3e 100755 --- a/bin/portageq +++ b/bin/portageq @@ -1397,9 +1397,7 @@ def main(argv): # portage.settings["EPREFIX"] here, but that would force # instantiation of portage.settings, which we don't want to do # until after we've calculated ROOT (see bug #529200). - eprefix = os.environ.get("EPREFIX", portage.const.EPREFIX) - if eprefix: - eprefix = portage.util.normalize_path(eprefix) + eprefix = portage.data._target_eprefix() eroot = portage.util.normalize_path(argv[2]) if eprefix: |