From 2c5efe10c2f4dd7bcc7d3722f7af2addf15892a0 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 2 May 2008 14:49:33 +0000 Subject: [PATCH] use configured values for portage user and group instead of hardcoded portage:portage svn path=/main/branches/prefix/; revision=10090 --- bin/emerge-webrsync | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 5cc7fe80c..b8e0c79c0 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -35,7 +35,7 @@ fi eval $(portageq envvar -v FEATURES FETCHCOMMAND GENTOO_MIRRORS \ PORTAGE_BIN_PATH PORTAGE_GPG_DIR \ PORTAGE_NICENESS PORTAGE_RSYNC_EXTRA_OPTS PORTAGE_TMPDIR PORTDIR \ - http_proxy ftp_proxy EPREFIX) + http_proxy ftp_proxy EPREFIX PORTAGE_USER PORTAGE_GROUP) DISTDIR="${PORTAGE_TMPDIR}/emerge-webrsync" export http_proxy ftp_proxy @@ -174,8 +174,8 @@ sync_local() { vecho "Syncing local tree ..." if type -P tarsync > /dev/null ; then - local chown_opts="-o portage -g portage" - chown portage:portage portage > /dev/null 2>&1 || chown_opts="" + local chown_opts="-o ${PORTAGE_USER:-portage} -g ${PORTAGE_GROUP:-portage}" + chown ${PORTAGE_USER:-portage}:${PORTAGE_GROUP:-portage} portage > /dev/null 2>&1 || chown_opts="" if ! tarsync $(vvecho -v) -s 1 ${chown_opts} \ -e /distfiles -e /packages -e /local "${file}" "${PORTDIR}"; then eecho "tarsync failed; tarball is corrupt? (${file})" -- 2.26.2