From 975fccbf19e5208e5b64f97980b4d7a6b91e4e28 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 10 Dec 2011 23:24:12 -0800 Subject: [PATCH] PORTAGE_OVERRIDE_EPREFIX: alphabetize vars --- bin/phase-functions.sh | 6 +++--- pym/portage/package/ebuild/_config/special_env_vars.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index bd8708c73..6dcf2b6b5 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -21,14 +21,14 @@ PORTAGE_READONLY_VARS="D EBUILD EBUILD_PHASE \ PORTAGE_DEBUG PORTAGE_DEPCACHEDIR PORTAGE_EBUILD_EXIT_FILE \ PORTAGE_GID PORTAGE_GRPNAME PORTAGE_INST_GID PORTAGE_INST_UID \ PORTAGE_IPC_DAEMON PORTAGE_IUSE PORTAGE_LOG_FILE \ - PORTAGE_MUTABLE_FILTERED_VARS PORTAGE_PYM_PATH PORTAGE_PYTHON \ + PORTAGE_MUTABLE_FILTERED_VARS PORTAGE_OVERRIDE_EPREFIX \ + PORTAGE_PYM_PATH PORTAGE_PYTHON \ PORTAGE_READONLY_METADATA PORTAGE_READONLY_VARS \ PORTAGE_REPO_NAME PORTAGE_RESTRICT \ PORTAGE_SAVED_READONLY_VARS PORTAGE_SIGPIPE_STATUS \ PORTAGE_TMPDIR PORTAGE_UPDATE_ENV PORTAGE_USERNAME \ PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR PORTDIR_OVERLAY \ - PROFILE_PATHS REPLACING_VERSIONS REPLACED_BY_VERSION T WORKDIR \ - PORTAGE_OVERRIDE_EPREFIX" + PROFILE_PATHS REPLACING_VERSIONS REPLACED_BY_VERSION T WORKDIR" PORTAGE_SAVED_READONLY_VARS="A CATEGORY P PF PN PR PV PVR" diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py index fd0bf2d62..6b378b3db 100644 --- a/pym/portage/package/ebuild/_config/special_env_vars.py +++ b/pym/portage/package/ebuild/_config/special_env_vars.py @@ -56,7 +56,7 @@ environ_whitelist += [ "PORTAGE_GID", "PORTAGE_GRPNAME", "PORTAGE_INST_GID", "PORTAGE_INST_UID", "PORTAGE_IPC_DAEMON", "PORTAGE_IUSE", - "PORTAGE_LOG_FILE", + "PORTAGE_LOG_FILE", "PORTAGE_OVERRIDE_EPREFIX", "PORTAGE_PYM_PATH", "PORTAGE_PYTHON", "PORTAGE_QUIET", "PORTAGE_REPO_NAME", "PORTAGE_RESTRICT", "PORTAGE_SIGPIPE_STATUS", @@ -66,7 +66,7 @@ environ_whitelist += [ "REPLACING_VERSIONS", "REPLACED_BY_VERSION", "ROOT", "ROOTPATH", "T", "TMP", "TMPDIR", "USE_EXPAND", "USE_ORDER", "WORKDIR", - "XARGS", "PORTAGE_OVERRIDE_EPREFIX", + "XARGS", ] # user config variables -- 2.26.2