aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-11-07 16:48:40 (GMT)
committerZac Medico <zmedico@gentoo.org>2012-11-07 16:48:40 (GMT)
commit228a860476d7543608b469c569ec1d4e70aa7f59 (patch)
treea9181916678b0f9dd893ed4e2bc7ca329863310e
parentprepstrip: check USERLAND outside of loop (diff)
downloadportage-228a860476d7543608b469c569ec1d4e70aa7f59.zip
portage-228a860476d7543608b469c569ec1d4e70aa7f59.tar.gz
portage-228a860476d7543608b469c569ec1d4e70aa7f59.tar.bz2
emerge-webrsync: rsync -o -g, bug #442190
This fixes a regression since the -a option was removed in commit e672b5ccbbbe38eda5c733fc799a20d92a8bdf75.
-rwxr-xr-xbin/emerge-webrsync7
-rwxr-xr-xmisc/emerge-delta-webrsync9
2 files changed, 11 insertions, 5 deletions
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 09b7574..e826ec4 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -221,10 +221,13 @@ sync_local() {
# Free disk space
${keep} || rm -f "${file}"
- 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 ..
__vecho "Cleaning up ..."
diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
index 9dd2a62..a782be7 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