bin/phase-functions.sh: Preserve PORTAGE_BZIP2_COMMAND in environment…

….bz2 Bug: https://bugs.gentoo.org/948067 Signed-off-by: Zac Medico <zmedico@gentoo.org>
gentoo · Jan 15, 2025 · 64c7c41 · 64c7c41
1 parent 0faca49
commit 64c7c41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -37,6 +37,8 @@ Bug fixes:
 
 * eapi.sh: Remove support for unofficial 4-slot-abi EAPI.
 
+* Preserve PORTAGE_BZIP2_COMMAND in environment.bz2 (bug #948067).
+
 portage-3.0.66.1 (2024-09-18)
 --------------
 

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
@@ -17,8 +17,8 @@ PORTAGE_READONLY_VARS="D EBUILD EBUILD_PHASE EBUILD_PHASE_FUNC \
 	PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC  \
 	PORTAGE_BINPKG_FILE PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE \
 	PORTAGE_BIN_PATH PORTAGE_BUILDDIR PORTAGE_BUILD_GROUP \
-	PORTAGE_BUILD_USER PORTAGE_BUNZIP2_COMMAND \
-	PORTAGE_BZIP2_COMMAND PORTAGE_COLORMAP PORTAGE_CONFIGROOT \
+	PORTAGE_BUILD_USER \
+	PORTAGE_COLORMAP PORTAGE_CONFIGROOT \
 	PORTAGE_DEBUG PORTAGE_DEPCACHEDIR PORTAGE_EBUILD_EXIT_FILE \
 	PORTAGE_ECLASS_LOCATIONS PORTAGE_EXPLICIT_INHERIT \
 	PORTAGE_GID PORTAGE_GRPNAME PORTAGE_INST_GID PORTAGE_INST_UID \
@@ -191,6 +191,9 @@ __preprocess_ebuild_env() {
 		# because it's already filtered above.
 		source "${PORTAGE_BIN_PATH}/save-ebuild-env.sh" || exit $?
 
+		# Prefer latest make.conf values of these.
+		unset PORTAGE_BZIP2_COMMAND PORTAGE_BUNZIP2_COMMAND
+
 		# Rely on __save_ebuild_env() to filter out any remaining variables
 		# and functions that could interfere with the current environment.
 		__save_ebuild_env || exit $?
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,8 @@ Bug fixes: @@
     * eapi.sh: Remove support for unofficial 4-slot-abi EAPI.
+    * Preserve PORTAGE_BZIP2_COMMAND in environment.bz2 (bug #948067).
     portage-3.0.66.1 (2024-09-18)
     --------------
@@ Expand Down @@