Skip to content

Commit 67d7f5b

Browse files
committed
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@duxsco.de>
1 parent 153a7e8 commit 67d7f5b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

bin/emerge-webrsync

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ eval "$("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \
8383
PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \
8484
PORTAGE_NICENESS PORTAGE_REPOSITORIES PORTAGE_RSYNC_EXTRA_OPTS \
8585
PORTAGE_RSYNC_OPTS PORTAGE_TEMP_GPG_DIR PORTAGE_TMPDIR \
86+
PORTAGE_USERNAME PORTAGE_GRPNAME \
8687
USERLAND http_proxy https_proxy ftp_proxy)"
8788
export http_proxy https_proxy ftp_proxy
8889

@@ -410,7 +411,7 @@ sync_local() {
410411

411412
[[ ${PORTAGE_QUIET} -eq 1 ]] || einfo "Syncing local repository ..."
412413

413-
local ownership="portage:portage"
414+
local ownership="${PORTAGE_USERNAME}:${PORTAGE_GRPNAME}"
414415
if has usersync ${FEATURES} ; then
415416
case "${USERLAND}" in
416417
BSD)

0 commit comments

Comments
 (0)