From 3251a6b957e0a41640490f96c5dbb676321c4801 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 5 Sep 2010 13:12:34 +0200 Subject: [PATCH] initialise config() with _eprefix set to the configured portage.const.EPREFIX val --- pym/portage/__init__.py | 2 +- pym/portage/const.py | 2 +- pym/portage/package/ebuild/config.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 08a99deb8..f61f8b44c 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -506,7 +506,7 @@ def create_trees(config_root=None, target_root=None, trees=None): del trees[myroot]["porttree"], myroot, portdb settings = config(config_root=config_root, target_root=target_root, - config_incrementals=portage.const.INCREMENTALS) + config_incrementals=portage.const.INCREMENTALS, _eprefix=EPREFIX) settings.lock() myroots = [(settings["ROOT"], settings)] diff --git a/pym/portage/const.py b/pym/portage/const.py index dcae9b58e..7029b75a0 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -64,7 +64,7 @@ CONFIG_MEMORY_FILE = PRIVATE_PATH + "/config" NEWS_LIB_PATH = "var/lib/gentoo" # these variables are not used with target_root or config_root -DEPCACHE_PATH = EPREFIX + "/var/cache/edb/dep" +DEPCACHE_PATH = "/var/cache/edb/dep" GLOBAL_CONFIG_PATH = DATADIR + "/portage/config" PORTAGE_BASE_PATH = PORTAGE_BASE PORTAGE_BIN_PATH = PORTAGE_BASE_PATH + "/bin" diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index fd3066f5e..ad495a9af 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -28,7 +28,7 @@ from portage.const import CACHE_PATH, \ DEPCACHE_PATH, INCREMENTALS, MAKE_CONF_FILE, \ MODULES_FILE_PATH, PORTAGE_BIN_PATH, PORTAGE_PYM_PATH, \ PRIVATE_PATH, PROFILE_PATH, USER_CONFIG_PATH, \ - USER_VIRTUALS_FILE, EPREFIX, EPREFIX_LSTRIP, BPREFIX + USER_VIRTUALS_FILE from portage.const import _SANDBOX_COMPAT_LEVEL from portage.dbapi import dbapi from portage.dbapi.porttree import portdbapi -- 2.26.2