commit: 04c5358b8b4b38a3c73cfd743a205bb7b40c0a21 Author: David Sardari <d <AT> duxsco <DOT> de> AuthorDate: Tue Jan 21 20:27:16 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 21 21:02:34 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=04c5358b
emerge-webrsync: Use variables PORTAGE_USERNAME and PORTAGE_GRPNAME Both variables default to "portage" according to "man 5 make.conf" and should be used instead of hardcoding "portage" user. Bug: https://bugs.gentoo.org/707980 Signed-off-by: David Sardari <d <AT> duxsco.de> Signed-off-by: Sam James <sam <AT> gentoo.org> bin/emerge-webrsync | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index caa4986da2..c135fd9c62 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -83,6 +83,7 @@ eval "$("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \ PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \ PORTAGE_NICENESS PORTAGE_REPOSITORIES PORTAGE_RSYNC_EXTRA_OPTS \ PORTAGE_RSYNC_OPTS PORTAGE_TEMP_GPG_DIR PORTAGE_TMPDIR \ + PORTAGE_USERNAME PORTAGE_GRPNAME \ USERLAND http_proxy https_proxy ftp_proxy)" export http_proxy https_proxy ftp_proxy @@ -410,7 +411,7 @@ sync_local() { [[ ${PORTAGE_QUIET} -eq 1 ]] || einfo "Syncing local repository ..." - local ownership="portage:portage" + local ownership="${PORTAGE_USERNAME}:${PORTAGE_GRPNAME}" if has usersync ${FEATURES} ; then case "${USERLAND}" in BSD)
