search for: flag_top_dir

I am using rsnapshot <http://www.rsnapshot.org/> to make snapshots of my filesystem. rsnapshot uses rsync to do all the heavy lifting. I was recently browsing my snapshots and discovered that none of the excluded files or files deleted in the source are getting deleted from the snapshot. rsnapshot calls rsync like this: /usr/bin/rsync -a --delete --numeric-ids --relative --delete-excluded

...at not too many files will be deleted */ + if (max_delete) { + + /* count number of files that would be deleted */ + deletion_test_count=0; + + for (j = 0; j < flist->count; j++) { + if (!(flist->files[j]->flags & FLAG_TOP_DIR) + || !S_ISDIR(flist->files[j]->mode)) + continue; + + argv[0] = f_name_to(flist->files[j], fbuf); + + if (!(local_file_list = send_file_list(-1, 1, argv))) + c...

...=============== RCS file: /cvsroot/rsync/flist.c,v retrieving revision 1.230 diff -c -b -d -r1.230 flist.c *** a/flist.c 11 Jun 2004 07:40:57 -0000 1.230 --- b/flist.c 17 Jun 2004 04:01:55 -0000 *************** *** 950,956 **** flist_expand(flist); ! if (write_batch) file->flags |= FLAG_TOP_DIR; if (file->basename[0]) { --- 950,956 ---- flist_expand(flist); ! if (write_batch) /* uh, why? TODO: remove and test */ file->flags |= FLAG_TOP_DIR; if (file->basename[0]) { *************** *** 1039,1044 **** --- 1039,1046 ---- /** + * Despite its name,...

I know that there are a million messages from newbies who cannot get --delete to work. This message is special. :) --delete works fine for me EXCEPT when the following two conditions are present: 1) I am using the --relative option, and 2) the deleted file is in a subdirectory of the SRC directory. Here is a demonstration of how to recreate this bug: lenny@mythtv:/tmp$ rsync --version rsync

...GNU General Public Licence for details. [root at arden-lt tmp]# ----------------------- [OK it's not very good removing lost+found, but that's not the problem]. I think the problem is the code in delete_in_dir() in generator.c: if (one_file_system) { if (file->flags & FLAG_TOP_DIR) filesystem_dev = *fs_dev; else if (filesystem_dev != *fs_dev) return; } As far as I can tell this is unnecessary. --one-file-system should only check the source filesystems not the destination filesystems. This code can cause worse problems too. I haven't...

...i], FREE_STRUCT); + pool_destroy(flist->file_pool); + pool_destroy(flist->hlink_pool); free(flist->files); free(flist); } @@ -1416,7 +1443,8 @@ static void clean_flist(struct file_list * else deletions will mysteriously fail with -R). */ if (flist->files[i]->flags & FLAG_TOP_DIR) flist->files[prev_i]->flags |= FLAG_TOP_DIR; - free_file(flist->files[i], CLEAR_STRUCT); + + clear_file(i, flist); } else prev_i = i; } Binary files cvs/getgroups and pool2/getgroups differ diff -rupNP --exclude-from cvs/.ignore cvs/hlink.c pool2/hlink.c --- cvs/hlink.c...

...if (!(flags & XMIT_SAME_ATIME)) + atime = (time_t)read_int(f); + } else + atime = time(NULL); if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -624,6 +639,7 @@ file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0; file->modtime = modtime; + file->atime = atime; file->length = file_length; file->mode = mode; file->uid = uid; @@ -838,6 +854,7 @@ file->flags = flags; file->modtime = st.st_mtime; + file->atime = st.st_atime; file->length = st.st_size; file...

...if (!(flags & XMIT_SAME_ATIME)) + atime = (time_t)read_int(f); + } else + atime = time(NULL); if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -638,6 +653,7 @@ file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0; file->modtime = modtime; + file->atime = atime; file->length = file_length; file->mode = mode; file->uid = uid; @@ -852,6 +868,7 @@ file->flags = flags; file->modtime = st.st_mtime; + file->atime = st.st_atime; file->length = st.st_size; file...

...=================== RCS file: /cvsroot/rsync/flist.c,v retrieving revision 1.231 diff -c -b -d -r1.231 flist.c *** flist.c 18 Jun 2004 16:29:21 -0000 1.231 --- flist.c 12 Jul 2004 00:37:47 -0000 *************** *** 950,958 **** flist_expand(flist); - if (write_batch) - file->flags |= FLAG_TOP_DIR; - if (file->basename[0]) { flist->files[flist->count++] = file; send_file_entry(file, f, base_flags); --- 950,955 ---- *************** *** 1301,1313 **** * protocol version 15 */ recv_uid_list(f, flist); - if (!read_batch) { /* Recv the io_error flag */...