aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2015-08-04 17:13:13 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2015-08-04 17:13:13 +0100
commitda6f52c936eac749727e09f6dd0db0c2fade58d5 (patch)
tree59c9e37da5501f19028dd8d5c615f452424f1875
parent56bc0c7ce91f79ae382dbaace8c9e4f83e2471f4 (diff)
downloadpaludis-da6f52c936eac749727e09f6dd0db0c2fade58d5.tar.gz
paludis-da6f52c936eac749727e09f6dd0db0c2fade58d5.tar.xz
Remove --new-compress from rsync
Doesn't work with older servers. Since no server version supports both --compress and --new-compress, use neither and let users specify it in sync_options if they need it. complaints -> rsync upstream
-rw-r--r--paludis/syncers/dorsync.in2
-rw-r--r--paludis/syncers/dotar.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/paludis/syncers/dorsync.in b/paludis/syncers/dorsync.in
index 332385c..a427183 100644
--- a/paludis/syncers/dorsync.in
+++ b/paludis/syncers/dorsync.in
@@ -89,7 +89,7 @@ REMOTE="${REMOTE#file://}"
REMOTE="${REMOTE#rsync+ssh://}"
${RSYNC_WRAPPER} rsync --recursive --links --safe-links --perms --times \
- --new-compress --force --whole-file --delete --delete-delay --stats --timeout=180 \
+ --force --whole-file --delete --delete-delay --stats --timeout=180 \
${PALUDIS_SYNC_FILTER_FILE:+--filter "merge ${PALUDIS_SYNC_FILTER_FILE}"} \
--exclude=/.cache --progress "${RSYNC_OPTIONS[@]}" "${REMOTE%/}/" "${LOCAL}/"
diff --git a/paludis/syncers/dotar.in b/paludis/syncers/dotar.in
index 613fd32..9ee4415 100644
--- a/paludis/syncers/dotar.in
+++ b/paludis/syncers/dotar.in
@@ -194,7 +194,7 @@ fi
[[ -d "${LOCAL}" ]] || mkdir -p "${LOCAL}"
${RSYNC_WRAPPER} rsync --recursive --links --safe-links --perms --times \
- --new-compress --force --whole-file --delete --delete-after --stats --timeout=180 \
+ --force --whole-file --delete --delete-after --stats --timeout=180 \
${PALUDIS_SYNC_FILTER_FILE:+--filter "merge ${PALUDIS_SYNC_FILTER_FILE}"} \
--exclude=/.cache --progress "${RSYNC_OPTIONS[@]}" "${UNPACKDIR}/" "${LOCAL}/"
cleanup_and_exit ${?}