| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-28 10:18:08 +0000 (Fri, 28 Mar 2008) |
| 3 |
New Revision: 9538 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/emerge-webrsync |
| 7 |
Log: |
| 8 |
* Skip the recusive chown call if it fails on the top level directory since |
| 9 |
it's possible that emerge-webrsync is not run by root. |
| 10 |
|
| 11 |
* Just chown to portage:portage instead of using PORTAGE_INST_{UID,GID}. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/bin/emerge-webrsync |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/bin/emerge-webrsync 2008-03-28 10:03:28 UTC (rev 9537) |
| 17 |
+++ main/trunk/bin/emerge-webrsync 2008-03-28 10:18:08 UTC (rev 9538) |
| 18 |
@@ -33,7 +33,7 @@ |
| 19 |
exit 1 |
| 20 |
fi |
| 21 |
eval $(portageq envvar -v FEATURES FETCHCOMMAND GENTOO_MIRRORS \ |
| 22 |
- PORTAGE_BIN_PATH PORTAGE_GPG_DIR PORTAGE_INST_UID PORTAGE_INST_GID \ |
| 23 |
+ PORTAGE_BIN_PATH PORTAGE_GPG_DIR \ |
| 24 |
PORTAGE_NICENESS PORTAGE_RSYNC_EXTRA_OPTS PORTAGE_TMPDIR PORTDIR \ |
| 25 |
http_proxy ftp_proxy) |
| 26 |
DISTDIR="${PORTAGE_TMPDIR}/emerge-webrsync" |
| 27 |
@@ -189,8 +189,8 @@ |
| 28 |
# Free disk space |
| 29 |
rm -f "${file}" |
| 30 |
|
| 31 |
- # Make sure user and group file ownership is ${PORTAGE_INST_UID}:${PORTAGE_INST_GID} |
| 32 |
- chown -R ${PORTAGE_INST_UID:-0}:${PORTAGE_INST_GID:-0} portage |
| 33 |
+ chown portage:portage portage &> /dev/null && \ |
| 34 |
+ chown -R portage:portage portage |
| 35 |
cd portage |
| 36 |
rsync -av --progress --stats --delete --delete-after \ |
| 37 |
--exclude='/distfiles' --exclude='/packages' \ |
| 38 |
|
| 39 |
-- |
| 40 |
gentoo-commits@l.g.o mailing list |
Archives