diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-11-07 08:48:40 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-11-07 08:48:40 -0800 |
commit | 228a860476d7543608b469c569ec1d4e70aa7f59 (patch) | |
tree | a9181916678b0f9dd893ed4e2bc7ca329863310e /misc | |
parent | 4ade44bb3c75422d02046e2328a02224cd265404 (diff) | |
download | portage-228a860476d7543608b469c569ec1d4e70aa7f59.tar.gz portage-228a860476d7543608b469c569ec1d4e70aa7f59.tar.bz2 portage-228a860476d7543608b469c569ec1d4e70aa7f59.zip |
emerge-webrsync: rsync -o -g, bug #442190
This fixes a regression since the -a option was removed in
commit e672b5ccbbbe38eda5c733fc799a20d92a8bdf75.
Diffstat (limited to 'misc')
-rwxr-xr-x | misc/emerge-delta-webrsync | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync index 9dd2a6281..a782be71d 100755 --- a/misc/emerge-delta-webrsync +++ b/misc/emerge-delta-webrsync @@ -302,11 +302,14 @@ sync_local() { echo "Executed command: tar jxf $FILE" exit 1 fi - # Make sure user and group file ownership is appropriate - chown ${ownership} portage > /dev/null 2>&1 && \ + + local rsync_opts="${PORTAGE_RSYNC_OPTS} ${PORTAGE_RSYNC_EXTRA_OPTS}" + if chown ${ownership} portage > /dev/null 2>&1; then chown -R ${ownership} portage + rsync_opts+=" --owner --group" + fi cd portage - rsync ${PORTAGE_RSYNC_OPTS} ${PORTAGE_RSYNC_EXTRA_OPTS} . "${PORTDIR%%/}" + rsync ${rsync_opts} . "${PORTDIR%%/}" cd .. echo "cleaning up" rm -rf portage |