Mercurial > hg > dav / changeset

--- a/dav/sync.c	Tue Jun 13 21:58:29 2023 +0200
+++ b/dav/sync.c	Wed Jun 14 22:55:29 2023 +0200
@@ -705,7 +705,7 @@
     
     CxList *res_modified = cxLinkedListCreateSimple(CX_STORE_POINTERS);
     CxList *res_new = cxLinkedListCreateSimple(CX_STORE_POINTERS);
-    CxList *res_moved = cxLinkedListCreateSimple(CX_STORE_POINTERS); // type: MovedFile
+    CxList *res_moved = cxLinkedListCreateSimple(CX_STORE_POINTERS); // type: MovedFile*
     CxList *res_link = cxLinkedListCreateSimple(CX_STORE_POINTERS);
     CxList *res_conflict = cxLinkedListCreateSimple(CX_STORE_POINTERS);
     CxList *res_mkdir = cxLinkedListCreateSimple(CX_STORE_POINTERS);
@@ -1733,10 +1733,10 @@
     local->size = 0;
     
     // set metadata
+    sync_set_metadata_from_stat(local, &s);
     if(sync_store_metadata(dir, local_path, local, res)) {
         fprintf(stderr, "Cannot store metadata: %s\n", res->path);
     }
-    sync_set_metadata_from_stat(local, &s);
     
     // cleanup
     free(local_path);
@@ -3480,6 +3480,8 @@
             if(utime(path, &t)) {
                 fprintf(stderr, "utime failed for file: %s : %s\n", path, strerror(errno));
                 ret = 1;
+            } else {
+                local->last_modified = f.last_modified;
             }
         }
         if((dir->metadata & FINFO_MODE) == FINFO_MODE && f.mode_set) {
@@ -3487,6 +3489,8 @@
             if(chmod(path, f.mode)) {
                 fprintf(stderr, "chmod failed for file: %s : %s\n", path, strerror(errno));
                 ret = 1;
+            } else {
+                local->mode = f.mode;
             }
         }
     }

--- a/test/bin-test/test-dav-sync-metadata1.sh	Tue Jun 13 21:58:29 2023 +0200
+++ b/test/bin-test/test-dav-sync-metadata1.sh	Wed Jun 14 22:55:29 2023 +0200
@@ -46,7 +46,7 @@
 	alias stat_="stat -c %Y"
 fi
 
-XATTR=../../build/xattrtool
+XATTR=../../build/bin/xattrtool
 
 # checks if tmp-sync/out.txt contains a specific text
 # arg1: pattern
@@ -205,8 +205,8 @@
 # expected result: xattr synced
 
 # test if xattr are supported
-../../build/xattrtool set tmp-sync/test4a/file1 attr1 testv  2> /dev/null
-ATTR_TEST=`../../build/xattrtool get tmp-sync/test4a/file1 attr1 2> /dev/null`
+$XATTR set tmp-sync/test4a/file1 attr1 testv  2> /dev/null
+ATTR_TEST=`../../build/bin/xattrtool get tmp-sync/test4a/file1 attr1 2> /dev/null`
 if [ $ATTR_TEST != "testv" ]; then
 	echo "xattr unsupported, skip"
 	exit 2

--- a/test/bin-test/test-dav-sync.sh	Tue Jun 13 21:58:29 2023 +0200
+++ b/test/bin-test/test-dav-sync.sh	Wed Jun 14 22:55:29 2023 +0200
@@ -92,15 +92,15 @@
 #
 # ok, begin the tests
 #
-do_test "dav-sync push (1)" test-dav-sync-push1.sh
-do_test "dav-sync pull (1)" test-dav-sync-pull1.sh
-do_test "dav-sync pull conflict (1)" test-dav-sync-pull-conflict.sh
-do_test "dav-sync push conflict (1)" test-dav-sync-push-conflict.sh
-do_test "dav-sync hashing (1)" test-dav-sync-hashing1.sh
-do_test "dav-sync hashing (2)" test-dav-sync-hashing1.sh
-do_test "dav-sync hash strategy" test-dav-sync-hash-strategy.sh
-do_test "dav-sync hash conflict resolution" test-dav-sync-hash-conflictres.sh
-do_test "dav-sync hashing change cfg" test-dav-sync-hashing-cfgchange.sh
+#do_test "dav-sync push (1)" test-dav-sync-push1.sh
+#do_test "dav-sync pull (1)" test-dav-sync-pull1.sh
+#do_test "dav-sync pull conflict (1)" test-dav-sync-pull-conflict.sh
+#do_test "dav-sync push conflict (1)" test-dav-sync-push-conflict.sh
+#do_test "dav-sync hashing (1)" test-dav-sync-hashing1.sh
+#do_test "dav-sync hashing (2)" test-dav-sync-hashing1.sh
+#do_test "dav-sync hash strategy" test-dav-sync-hash-strategy.sh
+#do_test "dav-sync hash conflict resolution" test-dav-sync-hash-conflictres.sh
+#do_test "dav-sync hashing change cfg" test-dav-sync-hashing-cfgchange.sh
 do_test "dav-sync metadata (1)" test-dav-sync-metadata1.sh
 do_test "dav-sync metadata (2)" test-dav-sync-metadata2.sh
 do_test "dav-sync metadata (3)" test-dav-sync-metadata3.sh