aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-02-03 00:48:51 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-02-03 00:48:51 +0000
commit4fce56582b214cbd28ec6d3246c4f9ef0f66d3ab (patch)
tree17717519e81bcaffe258aeca09613921e6992dae
parent7e9f6701a0db7b6875aced1532621d2a9b49b559 (diff)
downloadpaludis-4fce56582b214cbd28ec6d3246c4f9ef0f66d3ab.tar.gz
paludis-4fce56582b214cbd28ec6d3246c4f9ef0f66d3ab.tar.xz
Support --exclude as well as --exclude-from.
-rw-r--r--NEWS5
-rw-r--r--paludis/syncers/dorsync.in6
-rw-r--r--paludis/syncers/dotar.in6
3 files changed, 16 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 063c89f..7bd245b 100644
--- a/NEWS
+++ b/NEWS
@@ -4,8 +4,11 @@ News for Paludis
This file lists the major changes between versions. For a more detailed list
of every change, see the ChangeLog.
-0.26.0_alpha9:
+TRUNK:
+ * rsync based syncers (rsync://, file://, tar+http:// and tar+ftp://) now
+ support --exclude in sync_options, as well as --exclude-from.
+0.26.0_alpha9:
* Recent Portage unpacks lzma files, in violation of PMS and without any way
of ebuilds being able to check for this behaviour. We now emulate this
stupidity.
diff --git a/paludis/syncers/dorsync.in b/paludis/syncers/dorsync.in
index c5ecee9..28c37bd 100644
--- a/paludis/syncers/dorsync.in
+++ b/paludis/syncers/dorsync.in
@@ -17,6 +17,11 @@ RSYNC_OPTIONS=( )
while [[ $# -gt 0 ]]; do
case "${1}" in
+ --exclude=*)
+ RSYNC_OPTIONS[${#RSYNC_OPTIONS[@]}]=--exclude
+ RSYNC_OPTIONS[${#RSYNC_OPTIONS[@]}]="${1#*=}"
+ ;;
+
--exclude-from=*)
RSYNC_OPTIONS[${#RSYNC_OPTIONS[@]}]=--exclude-from
RSYNC_OPTIONS[${#RSYNC_OPTIONS[@]}]="${1#*=}"
@@ -37,6 +42,7 @@ while [[ $# -gt 0 ]]; do
fi
echo " Options:"
+ echo " --exclude=PATTERN Use PATTERN as an exclude pattern"
echo " --exclude-from=FILE Use FILE as a list of exclude patterns"
echo " --rsync-option=OPTION Pass OPTION to rsync"
exit 0
diff --git a/paludis/syncers/dotar.in b/paludis/syncers/dotar.in
index 40ec8ea..7eef6b8 100644
--- a/paludis/syncers/dotar.in
+++ b/paludis/syncers/dotar.in
@@ -23,6 +23,11 @@ while [[ $# -gt 0 ]]; do
UNPACK_OPTIONS[${#UNPACK_OPTIONS[@]}]=--tar-option="${1}"
;;
+ --exclude=*)
+ RSYNC_OPTIONS[${#RSYNC_OPTIONS[@]}]=--exclude
+ RSYNC_OPTIONS[${#RSYNC_OPTIONS[@]}]="${1#*=}"
+ ;;
+
--exclude-from=*)
RSYNC_OPTIONS[${#RSYNC_OPTIONS[@]}]=--exclude-from
RSYNC_OPTIONS[${#RSYNC_OPTIONS[@]}]="${1#*=}"
@@ -56,6 +61,7 @@ while [[ $# -gt 0 ]]; do
fi
echo " Options:"
+ echo " --exclude=PATTERN Use PATTERN as an exclude pattern"
echo " --exclude-from=FILE Use FILE as a list of exclude patterns"
echo " --strip-components=N Ignore the first N components of the"
echo " paths from the tarball"