Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10070 - main/trunk/bin
Date: Fri, 02 May 2008 02:56:49
Message-Id: E1JrlS2-0007H1-KM@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-05-02 02:56:45 +0000 (Fri, 02 May 2008)
3 New Revision: 10070
4
5 Modified:
6 main/trunk/bin/emerge-webrsync
7 Log:
8 Skip group/owner tarsync options for tarsync if chown on /usr/portage
9 fails, since the user might still be able to sync even though the
10 chown call is not permitted.
11
12
13 Modified: main/trunk/bin/emerge-webrsync
14 ===================================================================
15 --- main/trunk/bin/emerge-webrsync 2008-05-02 02:53:14 UTC (rev 10069)
16 +++ main/trunk/bin/emerge-webrsync 2008-05-02 02:56:45 UTC (rev 10070)
17 @@ -174,7 +174,10 @@
18 vecho "Syncing local tree ..."
19
20 if type -P tarsync > /dev/null ; then
21 - if ! tarsync $(vvecho -v) -s 1 -o portage -g portage -e /distfiles -e /packages -e /local "${file}" "${PORTDIR}"; then
22 + local chown_opts="-o portage -g portage"
23 + chown portage:portage portage > /dev/null 2>&1 || chown_opts=""
24 + if ! tarsync $(vvecho -v) -s 1 ${chown_opts} \
25 + -e /distfiles -e /packages -e /local "${file}" "${PORTDIR}"; then
26 eecho "tarsync failed; tarball is corrupt? (${file})"
27 return 1
28 fi
29
30 --
31 gentoo-commits@l.g.o mailing list