From 40fe38a1470bb81e5f828e0cf55a9f995dd0cc77 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 2 May 2008 02:56:45 +0000 Subject: Skip group/owner tarsync options for tarsync if chown on /usr/portage fails, since the user might still be able to sync even though the chown call is not permitted. svn path=/main/trunk/; revision=10070 --- bin/emerge-webrsync | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index ae4dfff35..24733840b 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -174,7 +174,10 @@ sync_local() { vecho "Syncing local tree ..." if type -P tarsync > /dev/null ; then - if ! tarsync $(vvecho -v) -s 1 -o portage -g portage -e /distfiles -e /packages -e /local "${file}" "${PORTDIR}"; then + local chown_opts="-o portage -g portage" + chown portage: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})" return 1 fi -- cgit v1.2.3-1-g7c22