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

[Sam James]

commit:     6741d540270f95e6ceec7ea7f4c8759f29814aa1
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Wed Jul  2 06:33:34 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul  4 02:17:03 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=6741d540

emerge-webrsync: correctly signify end-of-options to chown(1)

Recently, emerge-webrsync was made to specify the "--" operand for just
over a dozen external utilities. However, the operand was positioned
incorrectly for two instances of chown(1). Rectify that mistake.

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

 bin/emerge-webrsync | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 193f60bb8c..bf86ae763e 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -48,7 +48,7 @@ main() {
 
        mkdir -p -- "${repo_location}" || exit
        if contains_word usersync "${FEATURES}"; then
-               chown "${PORTAGE_USERNAME}":"${PORTAGE_GRPNAME}" -- 
"${repo_location}" || exit
+               chown -- "${PORTAGE_USERNAME}":"${PORTAGE_GRPNAME}" 
"${repo_location}" || exit
        fi
 
        if [[ ! -w ${repo_location} ]] ; then
@@ -390,7 +390,7 @@ sync_local() {
                einfo "Using tarsync to refresh ${repo_location@Q} ..."
 
                tarsync_opts=( -s 1 -e /distfiles -e /packages -e /local )
-               if chown "${ownership}" -- "${repo_location}" 2>/dev/null; then
+               if chown -- "${ownership}" "${repo_location}" 2>/dev/null; then
                        tarsync_opts+=( -o "${ownership%:*}" -g 
"${ownership#*:}" )
                fi
                if (( ! opt[quiet] )); then