Merge emerge-webrsync uid and gid fixes from the prefix branch.

svn path=/main/trunk/; revision=2923

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index ec4e59231a66fc9fc6c2807112fa7463dcb4e3b1..0e6867341cdaf7348e36c94984880f07447177e5 100755 (executable)
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -17,7 +17,8 @@ PORTDIR="$(/usr/lib/portage/bin/portageq portdir)"
 FETCHCOMMAND="$(/usr/lib/portage/bin/portageq envvar FETCHCOMMAND)"
 USERLAND="$(/usr/lib/portage/bin/portageq envvar USERLAND)"
 DISTDIR="$(/usr/lib/portage/bin/portageq envvar PORTAGE_TMPDIR)/emerge-webrsync"
-
+PORTAGE_INST_UID="$(/usr/lib/portage/bin/portageq envvar PORTAGE_INST_UID)"
+PORTAGE_INST_GID="$(/usr/lib/portage/bin/portageq envvar PORTAGE_INST_GID)"
 if [ ! -d $DISTDIR ] ; then
        mkdir -p $DISTDIR
 fi
@@ -50,7 +51,7 @@ fi
 sync_local() {
        echo Syncing local tree...
        if type -p tarsync &> /dev/null; then
-               if ! tarsync "${FILE}" "${PORTDIR}" -v -s 1 -o root -g root -e /distfiles -e /packages -e /local; then
+               if ! tarsync "${FILE}" "${PORTDIR}" -v -s 1 -o ${PORTAGE_INST_UID} -g ${PORTAGE_INST_GID} -e /distfiles -e /packages -e /local; then
                        echo "tarsync failed; tarball is corrupt?"
                        exit 1;
                fi
@@ -62,8 +63,8 @@ sync_local() {
                        exit 1
                fi
                rm -f $FILE
-               # Make sure user and group file ownership is root
-               chown -R 0:0 portage
+               # Make sure user and group file ownership is ${PORTAGE_INST_UID}:${PORTAGE_INST_GID}
+               chown -R ${PORTAGE_INST_UID}:${PORTAGE_INST_GID} portage
                cd portage
                rsync -av --progress --stats --delete --delete-after \
                --exclude='/distfiles' --exclude='/packages' \