In the mandriva rpm of rsync, we apply for our rpm the acl patch in the
patches directory.
I am trying to update our rpm to rsync 2.6.6 but one of the test failed with
this patch. It seems to be a minor problem, but can you have a look ?
Thanks by advance.
Following the message (a bit long):
----- itemize log follows
Testing for symlinks using 'test -h'
+ lddir=/tmp/rsync-2.6.6/testtmp.itemize/ld
+ chkfile=/tmp/rsync-2.6.6/testtmp.itemize/rsync.chk
+ outfile=/tmp/rsync-2.6.6/testtmp.itemize/rsync.out
+ makepath /tmp/rsync-2.6.6/testtmp.itemize/from/foo
+ echo ' makepath /tmp/rsync-2.6.6/testtmp.itemize/from/foo'
makepath /tmp/rsync-2.6.6/testtmp.itemize/from/foo
+ p=/tmp/rsync-2.6.6/testtmp.itemize/from/foo
+ echo /tmp/rsync-2.6.6/testtmp.itemize/from/foo
+ grep '^/'
+ cd /
++ echo /tmp/rsync-2.6.6/testtmp.itemize/from/foo
++ tr / ' '
+ for c in '`echo $p | tr '\''/'\'' '\''
'\''`'
+ '[' -d tmp ']'
+ cd tmp
+ for c in '`echo $p | tr '\''/'\'' '\''
'\''`'
+ '[' -d rsync-2.6.6 ']'
+ cd rsync-2.6.6
+ for c in '`echo $p | tr '\''/'\'' '\''
'\''`'
+ '[' -d testtmp.itemize ']'
+ cd testtmp.itemize
+ for c in '`echo $p | tr '\''/'\'' '\''
'\''`'
+ '[' -d from ']'
+ mkdir from
+ cd from
+ for c in '`echo $p | tr '\''/'\'' '\''
'\''`'
+ '[' -d foo ']'
+ mkdir foo
+ cd foo
+ makepath /tmp/rsync-2.6.6/testtmp.itemize/from/bar/baz
+ echo ' makepath /tmp/rsync-2.6.6/testtmp.itemize/from/bar/baz'
makepath /tmp/rsync-2.6.6/testtmp.itemize/from/bar/baz
+ p=/tmp/rsync-2.6.6/testtmp.itemize/from/bar/baz
+ echo /tmp/rsync-2.6.6/testtmp.itemize/from/bar/baz
+ grep '^/'
+ cd /
++ echo /tmp/rsync-2.6.6/testtmp.itemize/from/bar/baz
++ tr / ' '
+ for c in '`echo $p | tr '\''/'\'' '\''
'\''`'
+ '[' -d tmp ']'
+ cd tmp
+ for c in '`echo $p | tr '\''/'\'' '\''
'\''`'
+ '[' -d rsync-2.6.6 ']'
+ cd rsync-2.6.6
+ for c in '`echo $p | tr '\''/'\'' '\''
'\''`'
+ '[' -d testtmp.itemize ']'
+ cd testtmp.itemize
+ for c in '`echo $p | tr '\''/'\'' '\''
'\''`'
+ '[' -d from ']'
+ cd from
+ for c in '`echo $p | tr '\''/'\'' '\''
'\''`'
+ '[' -d bar ']'
+ mkdir bar
+ cd bar
+ for c in '`echo $p | tr '\''/'\'' '\''
'\''`'
+ '[' -d baz ']'
+ mkdir baz
+ cd baz
+ cp -p ./configure.in /tmp/rsync-2.6.6/testtmp.itemize/from/foo/config1
+ cp -p ./config.h.in /tmp/rsync-2.6.6/testtmp.itemize/from/foo/config2
+ cp -p ./rsync.h /tmp/rsync-2.6.6/testtmp.itemize/from/bar/baz/rsync
+ chmod
600 /tmp/rsync-2.6.6/testtmp.itemize/from/foo/config1
/tmp/rsync-2.6.6/testtmp.itemize/from/foo/config2
/tmp/rsync-2.6.6/testtmp.itemize/from/bar/baz/rsync
+ umask 0
+ ln -s ../bar/baz/rsync /tmp/rsync-2.6.6/testtmp.itemize/from/foo/sym
+ umask 022
+
ln /tmp/rsync-2.6.6/testtmp.itemize/from/foo/config1
/tmp/rsync-2.6.6/testtmp.itemize/from/foo/extra
+ /tmp/rsync-2.6.6/rsync
-iplr /tmp/rsync-2.6.6/testtmp.itemize/from/
/tmp/rsync-2.6.6/testtmp.itemize/to/
+ tee /tmp/rsync-2.6.6/testtmp.itemize/rsync.out
cd+++++++ bar/
cd+++++++ bar/baz/>f+++++++ bar/baz/rsync
cd+++++++ foo/>f+++++++ foo/config1
>f+++++++ foo/config2
>f+++++++ foo/extra
cL+++++++ foo/sym -> ../bar/baz/rsync
+ cat
+ diff
-u /tmp/rsync-2.6.6/testtmp.itemize/rsync.chk
/tmp/rsync-2.6.6/testtmp.itemize/rsync.out
+ /tmp/rsync-2.6.6/rsync -a -f '-!
*/' /tmp/rsync-2.6.6/testtmp.itemize/from/
/tmp/rsync-2.6.6/testtmp.itemize/to
+ cp -p ./configure.in /tmp/rsync-2.6.6/testtmp.itemize/from/foo/config2
+ chmod 601 /tmp/rsync-2.6.6/testtmp.itemize/from/foo/config2
+ /tmp/rsync-2.6.6/rsync
-iplrH /tmp/rsync-2.6.6/testtmp.itemize/from/
/tmp/rsync-2.6.6/testtmp.itemize/to/
+ tee /tmp/rsync-2.6.6/testtmp.itemize/rsync.out>f..T.... bar/baz/rsync
>f..T.... foo/config1
>f.sTp... foo/config2
hf..T.... foo/extra => foo/config1
+ cat
+ diff
-u /tmp/rsync-2.6.6/testtmp.itemize/rsync.chk
/tmp/rsync-2.6.6/testtmp.itemize/rsync.out
+ /tmp/rsync-2.6.6/rsync -a -f '-!
*/' /tmp/rsync-2.6.6/testtmp.itemize/from/
/tmp/rsync-2.6.6/testtmp.itemize/to
+ sleep 1
+ rm /tmp/rsync-2.6.6/testtmp.itemize/to/foo/sym
+ umask 0
+ ln -s ../bar/baz /tmp/rsync-2.6.6/testtmp.itemize/to/foo/sym
+ umask 022
+ cp -p ./config.h.in /tmp/rsync-2.6.6/testtmp.itemize/from/foo/config2
+ chmod 600 /tmp/rsync-2.6.6/testtmp.itemize/from/foo/config2
+ chmod 777 /tmp/rsync-2.6.6/testtmp.itemize/to/bar/baz/rsync
+ /tmp/rsync-2.6.6/rsync
-iplrtc /tmp/rsync-2.6.6/testtmp.itemize/from/
/tmp/rsync-2.6.6/testtmp.itemize/to/
+ tee /tmp/rsync-2.6.6/testtmp.itemize/rsync.out
.f..tp... bar/baz/rsync
.d..t.... foo/
.f..t.... foo/config1>fcstp... foo/config2
cL..T.... foo/sym -> ../bar/baz/rsync
+ cat
+ diff
-u /tmp/rsync-2.6.6/testtmp.itemize/rsync.chk
/tmp/rsync-2.6.6/testtmp.itemize/rsync.out
+ cp -p ./configure.in /tmp/rsync-2.6.6/testtmp.itemize/from/foo/config2
+ chmod 600 /tmp/rsync-2.6.6/testtmp.itemize/from/foo/config2
+ /tmp/rsync-2.6.6/rsync
-vvplrH /tmp/rsync-2.6.6/testtmp.itemize/from/
/tmp/rsync-2.6.6/testtmp.itemize/to/
+ tee /tmp/rsync-2.6.6/testtmp.itemize/rsync.out
building file list ...
done
delta-transmission disabled for local transfer or --whole-file
bar/baz/rsync
foo/config1
foo/config2
"foo/extra" is a hard link
foo/sym
total: matches=0 tag_hits=0 false_alarms=0 data=24421
sent 24701 bytes received 91 bytes 49584.00 bytes/sec
total size is 96557 speedup is 3.89
+ filter_outfile
+ sed -e '/^building file list /d' -e '/^created directory /d'
-e '/^done$/d'
-e '/ --whole-file$/d' -e '/^total: /d' -e '/^$/,$d'
+
mv /tmp/rsync-2.6.6/testtmp.itemize/rsync.out.new
/tmp/rsync-2.6.6/testtmp.itemize/rsync.out
+ cat
+ diff
-u /tmp/rsync-2.6.6/testtmp.itemize/rsync.chk
/tmp/rsync-2.6.6/testtmp.itemize/rsync.out
--- /tmp/rsync-2.6.6/testtmp.itemize/rsync.chk 2005-07-29 01:51:25.183562230
+0200
+++ /tmp/rsync-2.6.6/testtmp.itemize/rsync.out 2005-07-29 01:51:25.180562846
+0200
@@ -1,5 +1,5 @@
-bar/baz/rsync is uptodate
-foo/config1 is uptodate
+bar/baz/rsync
+foo/config1
foo/config2
"foo/extra" is a hard link
-foo/sym is uptodate
+foo/sym
+ test_fail 'test 4 failed'
+ echo 'test 4 failed'
test 4 failed
+ exit 1
----- itemize log ends
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url :
http://lists.samba.org/archive/rsync/attachments/20050729/44cb7862/attachment.bin
On Fri, Jul 29, 2005 at 01:57:05AM +0200, Olivier Thauvin wrote:> I am trying to update our rpm to rsync 2.6.6 but one of the test > failed with this patch.This revealed that the acls patch was not properly reporting what files were being updated when acls were not being preserved. The attached patch should fix this. ..wayne.. -------------- next part -------------- --- orig/acls.c 2005-07-28 19:28:30.093411321 -0700 +++ acls.c 2005-07-28 19:29:21.584004524 -0700 @@ -845,7 +845,7 @@ int dup_acl(const char *orig, const char types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT}; int ret = 0; if (!preserve_acls) - return 0; + return 1; for (type = &types[0]; type < &types[0] + sizeof types / sizeof types[0] && (*type == SMB_ACL_TYPE_ACCESS || S_ISDIR(mode)); @@ -962,7 +962,7 @@ static int set_keep_backup_acl() } return ret; } - return 0; + return 1; } void cleanup_keep_backup_acl() @@ -992,7 +992,7 @@ int set_acl(const char *fname, const str SMB_ACL_TYPE_T *type, types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT}; if (dry_run || !preserve_acls || S_ISLNK(file->mode)) - return 0; + return 1; if (file == backup_orig_file) { if (!strcmp(fname, backup_dest_fname)) return set_keep_backup_acl(); --- orig/rsync.h 2005-07-28 19:28:30.127408412 -0700 +++ rsync.h 2005-07-28 19:25:54.816695615 -0700 @@ -667,12 +667,12 @@ struct stats { #define SEND_ACL(file, f) #define RECEIVE_ACL(file, f) #define SORT_FILE_ACL_INDEX_LISTS() -#define SET_ACL(fname, file) 0 /* checked return value */ +#define SET_ACL(fname, file) 1 /* checked return value */ #define NEXT_ACL_UID() #define ACL_UID_MAP(uid) #define PUSH_KEEP_BACKUP_ACL(file, orig, dest) #define CLEANUP_KEEP_BACKUP_ACL() -#define DUP_ACL(src, orig, mode) 0 /* checked return value */ +#define DUP_ACL(src, orig, mode) 1 /* checked return value */ #endif /* SUPPORT_ACLS */ #include "smb_acls.h"
Le Vendredi 29 Juillet 2005 04:34, Wayne Davison a ?crit?:> On Fri, Jul 29, 2005 at 01:57:05AM +0200, Olivier Thauvin wrote: > > I am trying to update our rpm to rsync 2.6.6 but one of the test > > failed with this patch. > > This revealed that the acls patch was not properly reporting what files > were being updated when acls were not being preserved. The attached > patch should fix this.I am impress, you act very quickly, Thanks a lot. -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available Url : http://lists.samba.org/archive/rsync/attachments/20050729/7b652468/attachment.bin