[SCM] The rsync repository. - branch master updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Sat May 5 09:09:52 MDT 2012


The branch, master has been updated
       via  d51a3ad Set the modtime to 0 on a partial file. Fixes debian bug 624826.
      from  b55115e Fix --only-write-batch hang with --hard-links. Fixes bug 8565.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d51a3adb4fca3e6b1b046c6e570828f3bca8fe36
Author: Wayne Davison <wayned at samba.org>
Date:   Sat May 5 08:01:09 2012 -0700

    Set the modtime to 0 on a partial file.
    Fixes debian bug 624826.

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

Summary of changes:
 cleanup.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/cleanup.c b/cleanup.c
index cf5f212..147c3a7 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -158,6 +158,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 
 		if (cleanup_got_literal && cleanup_fname && cleanup_new_fname
 		 && keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
+			int tweak_modtime = 0;
 			const char *fname = cleanup_fname;
 			cleanup_fname = NULL;
 			if (cleanup_fd_r != -1)
@@ -166,8 +167,15 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 				flush_write_file(cleanup_fd_w);
 				close(cleanup_fd_w);
 			}
+			if (!partial_dir) {
+			    /* We don't want to leave a partial file with a modern time or it
+			     * could be skipped via --update.  Setting the time to something
+			     * really old also helps it to stand out as unfinished in an ls. */
+			    tweak_modtime = 1;
+			    cleanup_file->modtime = 0;
+			}
 			finish_transfer(cleanup_new_fname, fname, NULL, NULL,
-					cleanup_file, 0, !partial_dir);
+					cleanup_file, tweak_modtime, !partial_dir);
 		}
 
 		/* FALLTHROUGH */


-- 
The rsync repository.


More information about the rsync-cvs mailing list