From 939c864f562b370ddd72efa78ebd67022a5ccf45 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 3 Mar 2010 19:20:03 +0000 Subject: [PATCH] add missing EPREFIX imports svn path=/main/branches/prefix/; revision=15741 --- pym/portage/_legacy_globals.py | 2 +- pym/portage/package/ebuild/doebuild.py | 2 +- pym/portage/package/ebuild/prepare_build_dirs.py | 1 + pym/portage/util/env_update.py | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/portage/_legacy_globals.py b/pym/portage/_legacy_globals.py index 19fce20d1..c1da4c532 100644 --- a/pym/portage/_legacy_globals.py +++ b/pym/portage/_legacy_globals.py @@ -4,7 +4,7 @@ import portage from portage import os -from portage.const import CACHE_PATH, PROFILE_PATH +from portage.const import CACHE_PATH, PROFILE_PATH, EPREFIX def _get_legacy_global(name): constructed = portage._legacy_globals_constructed diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index c7f852f07..e04f7eb15 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -33,7 +33,7 @@ from portage import auxdbkeys, bsd_chflags, dep_check, \ unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \ _shell_quote, _split_ebuild_name_glep55, _unicode_decode, _unicode_encode from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_BINARY, \ - INVALID_ENV_FILE, MISC_SH_BINARY + INVALID_ENV_FILE, MISC_SH_BINARY, EPREFIX, EPREFIX_LSTRIP from portage.data import portage_gid, portage_uid, secpass, \ uid, userpriv_groups from portage.dbapi.virtual import fakedbapi diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/portage/package/ebuild/prepare_build_dirs.py index e7ef42598..b950a7b8c 100644 --- a/pym/portage/package/ebuild/prepare_build_dirs.py +++ b/pym/portage/package/ebuild/prepare_build_dirs.py @@ -18,6 +18,7 @@ from portage.localization import _ from portage.output import colorize from portage.util import apply_recursive_permissions, \ apply_secpass_permissions, ensure_dirs, writemsg +from portage.const import EPREFIX def prepare_build_dirs(myroot, mysettings, cleanup): diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py index ef3ad5a03..5f18a044b 100644 --- a/pym/portage/util/env_update.py +++ b/pym/portage/util/env_update.py @@ -20,6 +20,7 @@ from portage.process import find_binary from portage.util import atomic_ofstream, ensure_dirs, getconfig, \ normalize_path, writemsg from portage.util.listdir import listdir +from portage.const import EPREFIX, EPREFIX_LSTRIP if sys.hexversion >= 0x3000000: long = int -- 2.26.2