| 1 |
Author: grobian |
| 2 |
Date: 2008-05-02 14:49:33 +0000 (Fri, 02 May 2008) |
| 3 |
New Revision: 10090 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/emerge-webrsync |
| 7 |
Log: |
| 8 |
use configured values for portage user and group instead of hardcoded portage:portage |
| 9 |
|
| 10 |
Modified: main/branches/prefix/bin/emerge-webrsync |
| 11 |
=================================================================== |
| 12 |
--- main/branches/prefix/bin/emerge-webrsync 2008-05-02 14:40:49 UTC (rev 10089) |
| 13 |
+++ main/branches/prefix/bin/emerge-webrsync 2008-05-02 14:49:33 UTC (rev 10090) |
| 14 |
@@ -35,7 +35,7 @@ |
| 15 |
eval $(portageq envvar -v FEATURES FETCHCOMMAND GENTOO_MIRRORS \ |
| 16 |
PORTAGE_BIN_PATH PORTAGE_GPG_DIR \ |
| 17 |
PORTAGE_NICENESS PORTAGE_RSYNC_EXTRA_OPTS PORTAGE_TMPDIR PORTDIR \ |
| 18 |
- http_proxy ftp_proxy EPREFIX) |
| 19 |
+ http_proxy ftp_proxy EPREFIX PORTAGE_USER PORTAGE_GROUP) |
| 20 |
DISTDIR="${PORTAGE_TMPDIR}/emerge-webrsync" |
| 21 |
export http_proxy ftp_proxy |
| 22 |
|
| 23 |
@@ -174,8 +174,8 @@ |
| 24 |
vecho "Syncing local tree ..." |
| 25 |
|
| 26 |
if type -P tarsync > /dev/null ; then |
| 27 |
- local chown_opts="-o portage -g portage" |
| 28 |
- chown portage:portage portage > /dev/null 2>&1 || chown_opts="" |
| 29 |
+ local chown_opts="-o ${PORTAGE_USER:-portage} -g ${PORTAGE_GROUP:-portage}" |
| 30 |
+ chown ${PORTAGE_USER:-portage}:${PORTAGE_GROUP:-portage} portage > /dev/null 2>&1 || chown_opts="" |
| 31 |
if ! tarsync $(vvecho -v) -s 1 ${chown_opts} \ |
| 32 |
-e /distfiles -e /packages -e /local "${file}" "${PORTDIR}"; then |
| 33 |
eecho "tarsync failed; tarball is corrupt? (${file})" |
| 34 |
|
| 35 |
-- |
| 36 |
gentoo-commits@l.g.o mailing list |
Archives