The branch, master has been updated
via 0b67d5e Fix xattrs test on OS X.
from d52aeae Improve the &merge/&include example explanation.
;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0b67d5e396f54dc07fad3a22b05921d4f00768fc
Author: Wayne Davison <way...@samba.org>
Date: Sun Mar 13 20:42:58 2011 -0700
Fix xattrs test on OS X.
-----------------------------------------------------------------------
Summary of changes:
testsuite/rsync.fns | 1 +
testsuite/xattrs.test | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 7ea2a9c..ca05297 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -26,6 +26,7 @@ chkdir="$tmpdir/chk"
all_plus='+++++++++'
allspace=' '
dots='.....' # trailing dots after changes
+tab_ch=' ' # a single tab character
# Berkley's nice.
PATH="$PATH:/usr/ucb"
diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test
index f754d00..7200f25 100644
--- a/testsuite/xattrs.test
+++ b/testsuite/xattrs.test
@@ -18,8 +18,9 @@ case "`xattr 2>&1`" in
xattr -s "$xnam" "$xval" "${@}"
}
xls() {
- xattr -l "${@}"
+ xattr -l "${@}" | sed "s/^[ $tab_ch]*//"
}
+ RSYNC_PREFIX='rsync'
RUSR='rsync.nonuser'
;;
*)
@@ -32,6 +33,7 @@ case "`xattr 2>&1`" in
xls() {
getfattr -d "${@}"
}
+ RSYNC_PREFIX='user.rsync'
RUSR='user.rsync'
;;
esac
@@ -125,8 +127,8 @@ cd "$chkdir"
chmod go-rwx . $dirs $files
xset user.nice 'this is nice, but different' file1
-xset user.rsync.%stat "40000 0,0 $uid_gid" $dirs
-xset user.rsync.%stat "100000 0,0 $uid_gid" $files
+xset $RSYNC_PREFIX.%stat "40000 0,0 $uid_gid" $dirs
+xset $RSYNC_PREFIX.%stat "100000 0,0 $uid_gid" $files
xls $dirs $files >"$scratchdir/xattrs.txt"
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
