commit: 060ac9e10d210d7813e48701fa266d204f177c9c
Author: Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Wed Jul 23 03:53:45 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 25 09:51:33 2025 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=060ac9e1
save-ebuild-env.sh: disambiguate variables set following ebuild.sh execution
Presently, the __save_ebuild_env() filters out a number of variable and
variable prefixes that are introduced by a comment describing them as
"portage config variables and variables set directly by portage". Of
these, some are environment variables, as propagated by "doebuild.py" at
the point that it executes the "ebuild.sh" utility, whereas others are
set in bash once said utility is up and running.
Present the variables falling into these two categories as two distinct
groups, making it easier to determine their provenance. This is merely a
cosmetic change (although separating them took some effort).
Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
bin/save-ebuild-env.sh | 52 ++++++++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index d35b27baf2..b48aa3d120 100644
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -98,44 +98,23 @@ __save_ebuild_env() (
# Portage config variables and variables set directly by
portage.
ACCEPT_LICENSE
BUILD_PREFIX
- COLS
DISTDIR
DOC_SYMLINKS_DIR
EBUILD_FORCE_TEST
- EBUILD_MASTER_PID
- ECLASS_DEPTH
- ENDCOL
FAKEROOTKEY
- HOME
- LAST_E_CMD
- LAST_E_LEN
LD_PRELOAD
- MISC_FUNCTIONS_ARGS
- MOPREFIX
NOCOLOR
NO_COLOR
PKGDIR
PKGUSE
PKG_LOGDIR
PKG_TMPDIR
- PORTAGE_BASHRCS_SOURCED
PORTAGE_BASHRC_FILES
- PORTAGE_COLOR_BAD
- PORTAGE_COLOR_BRACKET
- PORTAGE_COLOR_ERR
- PORTAGE_COLOR_GOOD
- PORTAGE_COLOR_HILITE
- PORTAGE_COLOR_INFO
- PORTAGE_COLOR_LOG
- PORTAGE_COLOR_NORMAL
- PORTAGE_COLOR_QAWARN
- PORTAGE_COLOR_WARN
PORTAGE_COMPRESS
PORTAGE_COMPRESS_EXCLUDE_SUFFIXES
PORTAGE_DOHTML_UNWARNED_SKIPPED_EXTENSIONS
PORTAGE_DOHTML_UNWARNED_SKIPPED_FILES
PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES
- PORTAGE_NONFATAL
PORTAGE_QUIET
PORTAGE_SANDBOX_DENY
PORTAGE_SANDBOX_PREDICT
@@ -143,17 +122,40 @@ __save_ebuild_env() (
PORTAGE_SANDBOX_WRITE
PORTAGE_SOCKS5_PROXY
PREROOTPATH
+ ROOT
+ ROOTPATH
+ RPMDIR
+ USE_EXPAND
+
+ # Variables set directly in bash following ebuild.sh execution.
+ COLS
+ EBUILD_MASTER_PID
+ ECLASS_DEPTH
+ ENDCOL
+ HOME
+ LAST_E_CMD
+ LAST_E_LEN
+ MISC_FUNCTIONS_ARGS
+ MOPREFIX
+ PORTAGE_BASHRCS_SOURCED
+ PORTAGE_COLOR_BAD
+ PORTAGE_COLOR_BRACKET
+ PORTAGE_COLOR_ERR
+ PORTAGE_COLOR_GOOD
+ PORTAGE_COLOR_HILITE
+ PORTAGE_COLOR_INFO
+ PORTAGE_COLOR_LOG
+ PORTAGE_COLOR_NORMAL
+ PORTAGE_COLOR_QAWARN
+ PORTAGE_COLOR_WARN
+ PORTAGE_NONFATAL
QA_INTERCEPTORS
RC_DOT_PATTERN
RC_ENDCOL
RC_INDENTATION
- ROOT
- ROOTPATH
- RPMDIR
TEMP
TMP
TMPDIR
- USE_EXPAND
XARGS
_RC_GET_KV_CACHE
