commit: a1e6f32ab5034457730a165774b6d34f92e64fc6
Author: Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Tue Jun 3 17:01:34 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 3 20:49:52 2025 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a1e6f32a
Don't report a phantom -p1 option in _eapply_patch() exceptions
In the course of recently re-factoring the eapply() and _eapply_patch()
functions, one of the changes made was to have the patch(1) arguments be
reported exactly as they are in the case that an exception is thrown.
However, I forgot to remove a hard-coded instance of "-p1" in the
message template, which is harmless but confusing. Remove it.
Also, use the ${param@Q} form of expansion to convey both the arguments
and the name of the patch. Doing so is acceptable, given a target of
>=bash-4.4.
Fixes: d11490f9d83baefc1dad02d9be63c74e4c1da04f
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 cc1a3b9565..fbda4a29fa 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -1003,7 +1003,7 @@ if ___eapi_has_eapply; then
else
printf '%s\n' "${output}" >&2
eend 1
- __helpers_die "patch -p1 $* failed with
${patch}"
+ __helpers_die "patch ${*@Q} failed with
${patch@Q}"
fi
}
