[SCM] The rsync repository. - branch master updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Wed Jul 8 06:52:55 UTC 2020


The branch, master has been updated
       via  7265d961 Avoid non-updating proto.h on Alpine.
       via  560b63b0 Avoid a test failure on Alpine.
      from  0eb82a7c Fix xattr issue with MIGHT_NEED_PRE. Fixes bugzilla 13113.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7265d9611641d24a8570a2ebd0e313b6923346a9
Author: Wayne Davison <wayne at opencoder.net>
Date:   Tue Jul 7 23:49:37 2020 -0700

    Avoid non-updating proto.h on Alpine.

commit 560b63b05104a7051a1e76d464e787b3cd1e330a
Author: Wayne Davison <wayne at opencoder.net>
Date:   Tue Jul 7 23:05:41 2020 -0700

    Avoid a test failure on Alpine.

-----------------------------------------------------------------------

Summary of changes:
 mkproto.awk            | 1 +
 testsuite/itemize.test | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/mkproto.awk b/mkproto.awk
index ab97d54f..a64d132e 100644
--- a/mkproto.awk
+++ b/mkproto.awk
@@ -2,6 +2,7 @@
 
 BEGIN {
     while ((getline i < "proto.h") > 0) old_protos = old_protos ? old_protos "\n" i : i
+    close("proto.h")
     protos = "/* This file is automatically generated with \"make proto\". DO NOT EDIT */\n"
 }
 
diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index bbdfc942..c37f9785 100644
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -79,12 +79,12 @@ EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
 
 $RSYNC -a -f '-! */' "$fromdir/" "$todir"
+cp -p "$srcdir/config.sub" "$fromdir/foo/config2"
 sleep 1 # For directory mod below to ensure time difference
 rm "$todir/foo/sym"
 umask 0
 ln -s ../bar/baz "$todir/foo/sym"
 umask 022
-cp -p "$srcdir/config.sub" "$fromdir/foo/config2"
 chmod 600 "$fromdir/foo/config2"
 chmod 777 "$todir/bar/baz/rsync"
 


-- 
The rsync repository.



More information about the rsync-cvs mailing list