The branch, master has been updated
via 96ed96da Fix the parsing of the --version capabilities.
via 8ad2ca9a Install yodl for the CI builds.
from 23a37eca Get indent right.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 96ed96dabda2e535929eb69ab5f38b057650ef47
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon May 25 23:42:33 2020 -0700
Fix the parsing of the --version capabilities.
commit 8ad2ca9ae2220d795ae7f96fdbb4d9c8353ec414
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon May 25 23:41:39 2020 -0700
Install yodl for the CI builds.
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/ccpp.yml | 2 +-
testsuite/acls.test | 2 +-
testsuite/chown.test | 2 +-
testsuite/default-acls.test | 2 +-
testsuite/devices.test | 2 +-
testsuite/itemize.test | 2 +-
testsuite/xattrs.test | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 6bc75b48..131890ea 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: prepare-packages
- run: sudo apt-get install fakeroot acl libacl1-dev attr libattr1-dev
liblz4-dev
+ run: sudo apt-get install fakeroot acl libacl1-dev attr libattr1-dev
liblz4-dev yodl
- name: prepare-source
run: ./prepare-source
- name: configure
diff --git a/testsuite/acls.test b/testsuite/acls.test
index 40490a67..5728cd57 100644
--- a/testsuite/acls.test
+++ b/testsuite/acls.test
@@ -7,7 +7,7 @@
. $suitedir/rsync.fns
-$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is
configured without ACL support"
+$RSYNC --version | grep "[, ] ACLs" >/dev/null || test_skipped "Rsync is
configured without ACL support"
makepath "$fromdir/foo"
echo something >"$fromdir/file1"
diff --git a/testsuite/chown.test b/testsuite/chown.test
index 30a3a94d..aa4958d8 100644
--- a/testsuite/chown.test
+++ b/testsuite/chown.test
@@ -15,7 +15,7 @@
case $0 in
*fake*)
- $RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync needs
xattrs for fake device tests"
+ $RSYNC --version | grep "[, ] xattrs" >/dev/null || test_skipped "Rsync
needs xattrs for fake device tests"
RSYNC="$RSYNC --fake-super"
TLS_ARGS="$TLS_ARGS --fake-super"
case "$HOST_OS" in
diff --git a/testsuite/default-acls.test b/testsuite/default-acls.test
index eb41a6ff..17893f93 100644
--- a/testsuite/default-acls.test
+++ b/testsuite/default-acls.test
@@ -7,7 +7,7 @@
. $suitedir/rsync.fns
-$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is
configured without ACL support"
+$RSYNC --version | grep "[, ] ACLs" >/dev/null || test_skipped "Rsync is
configured without ACL support"
case "$setfacl_nodef" in
true) test_skipped "I don't know how to use your setfacl command" ;;
diff --git a/testsuite/devices.test b/testsuite/devices.test
index a9245138..0af0428b 100644
--- a/testsuite/devices.test
+++ b/testsuite/devices.test
@@ -16,7 +16,7 @@ outfile="$scratchdir/rsync.out"
case $0 in
*fake*)
- $RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync needs
xattrs for fake device tests"
+ $RSYNC --version | grep "[, ] xattrs" >/dev/null || test_skipped "Rsync
needs xattrs for fake device tests"
RSYNC="$RSYNC --fake-super"
TLS_ARGS="$TLS_ARGS --fake-super"
case "$HOST_OS" in
diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index 78637ca4..3a5af1c3 100644
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -40,7 +40,7 @@ case "$RSYNC" in
T=.T
;;
*)
- if $RSYNC --version | grep ", symtimes" >/dev/null; then
+ if $RSYNC --version | grep "[, ] symtimes" >/dev/null; then
T=.t
else
T=.T
diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test
index 86165e0c..5931ffcd 100644
--- a/testsuite/xattrs.test
+++ b/testsuite/xattrs.test
@@ -8,7 +8,7 @@
. $suitedir/rsync.fns
lnkdir="$tmpdir/lnk"
-$RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync is
configured without xattr support"
+$RSYNC --version | grep "[, ] xattrs" >/dev/null || test_skipped "Rsync is
configured without xattr support"
case "$HOST_OS" in
darwin*)
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
