[gentoo-commits] proj/portage:master commit in: bin/

[Sam James]

commit:     768d2dc5f276f8100e9851913a15198b41374cda
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Sat May 31 11:06:43 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 21:42:01 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=768d2dc5

phase-helpers.sh: signify end of options to eapply() in eapply_user()

Currently, it is impossible for the conveyed path to be treated as an
option, owing to the manner in which 'basedir' is composed.
Nevertheless, to convey to eapply() that the argument is to be treated
as an operand is appropriate.

Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/phase-helpers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index be70c4b20e..bd97a7e044 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -1106,7 +1106,7 @@ if ___eapi_has_eapply_user; then
                        einfo 
"${PORTAGE_COLOR_INFO}${hr}${PORTAGE_COLOR_NORMAL}"
                        einfo "Applying user patches from ${basedir} ..."
                        while IFS= read -rd '' basename; do
-                               eapply "${patch_by[$basename]}"
+                               eapply -- "${patch_by[$basename]}"
                        done < <(printf '%s\0' "${!patch_by[@]}" | LC_ALL=C 
sort -z)
                        einfo "User patches applied."
                        einfo 
"${PORTAGE_COLOR_INFO}${hr}${PORTAGE_COLOR_NORMAL}"