search for: make_backup

...2.6.6/generator.c Mon Mar 12 21:04:28 2007 --- rsync 2.6.6+/generator.c Mon Apr 2 19:21:09 2007 *************** static int delete_item(char *fname, int *** 190,197 **** || (dry_run && zap_dir)) { ok = 0; errno = ENOTEMPTY; ! } else if (make_backups && !backup_dir && !is_backup_file(fname) - && !(flags & DEL_FORCE_RECURSE)) ok = make_backup(fname); else ok = do_rmdir(fname) == 0; --- 190,198 ---- || (dry_run && zap_dir)) { ok...

Skipped content of type multipart/mixed-------------- 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/20030728/49616c2f/attachment.bin

...kept = 1; - do_unlink(fname); + if (!backup_only) + do_unlink(fname); } #endif @@ -233,11 +240,11 @@ /* make an empty directory */ make_bak_dir(fname, backup_dir); do_mkdir(keep_name, file->mode); - ret_code = do_rmdir(fname); - if(verbose>2) { - rprintf(FINFO, "make_backup : RMDIR %s returns %i\n", - fname, ret_code); + if (!backup_only) { + ret_code=do_rmdir(fname); + if(verbose>2) + rprintf(FINFO,"make_backup : RMDIR %s returns %i\n",fname,ret_code); } kept = 1; } @@ -257,7 +264,8 @@ rprintf(FERROR, "link %s -> %s...

Hi, I have question about the behavior of --backup-dir with --delete-after option. In my testing with version 2.6.4, it appears that the backup option only backups altered files. Files that will be deleted on the destination system will NOT be placed in --backup-dir location. I would like to back up deleted files. Is there a way to do this? Thanks

...efore it is moved into place. Please include this change in the next version of rsync. diff -ur src-2.5.6/rsync.c src-2.5.6-local/rsync.c --- src-2.5.6/rsync.c 2001-12-20 16:33:13.000000000 +0100 +++ src-2.5.6-local/rsync.c 2003-05-20 15:17:56.000000000 +0200 @@ -237,6 +237,9 @@ if (make_backups && !make_backup(fname)) return; + /* change permissions before putting the file in place */ + set_perms(fnametmp,file,NULL,0); + /* move tmp file over real file */ if (robust_rename(fnametmp,fname) != 0) { if (errno == EXDEV) { @...

Dear All, I have been seeing some strange behavior using rsync 3.1.1 on OSX with the 3 standard patches applied when using the --backup and --backup-Dir options. This works as expected on 3.0.9, moving any files on dest that are not on source to the backup folder. If no changes then the backup folder is not even created. -aHAXN --fileflags --force-change --protect-decmpfs ?delete --backup

Dear All, I found a workaround for the corrupted backup app package files though there is probably a more intelligent way. When the destination is empty or missing (rather than an update) rsync.c calls make_backup and returns 1 when it encounters if (x_lstat(fname, &sx.st, NULL) < 0) return 1; the calling code in rsync.c: if ( make_backups > 0 && overwriting_basis) { int ok = make_backup(fname, False); if (!ok) return 1; if (ok == 1 && fnamecmp == fname) fnamecmp...

...39; never took this eventuality into > account. > And now his patch. We hope it's helpful: *** rsync.c.orig Tue Mar 23 10:16:15 2004 --- rsync.c Fri Jun 18 19:51:37 2004 *************** *** 33,38 **** --- 33,39 ---- extern int preserve_gid; extern int preserve_perms; extern int make_backups; + extern int update_only; /* *************** *** 235,241 **** --- 236,261 ---- if (make_backups && !make_backup(fname)) return; + /* if the target has been modified since the file list was generated, + just delete the tmp file, leaving the target behind. */ + + i...

...p), strerror(errno)); + exit_cleanup(RERR_FILEIO); + } if (verbose > 2) rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname); --- rsync-2.6.1/options.c.bak 2004-04-17 20:07:23.000000000 +0300 +++ rsync-2.6.1/options.c 2004-04-27 19:28:10.000000000 +0300 @@ -37,6 +37,7 @@ int make_backups = 0; **/ int whole_file = -1; +int do_fsync = 0; int archive_mode = 0; int copy_links = 0; int preserve_links = 0; @@ -230,6 +231,7 @@ void usage(enum logcode F) rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n"); rprintf(F,"...

...fault. #0 0x80536c0 in keep_backup (fname=0x808f060 "rsync.core") at backup.c:266 266 if (!kept && preserve_hard_links && file->link_u.links (gdb) where #0 0x80536c0 in keep_backup (fname=0x808f060 "rsync.core") at backup.c:266 #1 0x80537c9 in make_backup (fname=0x808f060 "rsync.core") at backup.c:297 #2 0x804c003 in delete_files (flist=0x8096100) at receiver.c:112 #3 0x805028c in do_recv (f_in=3, f_out=3, flist=0x8096100, local_name=0x0) at main.c:434 #4 0x805093c in client_run (f_in=3, f_out=3, pid=-1, argc=1, argv=0x8095004)...

...eive errors, when > file already copied and renamed from tempfile, but permission are not yet > set. So I fixed it with following diff: > > --- rsync.c.orig Fri Jul 19 13:37:25 2002 > +++ rsync.c Fri Jul 19 13:36:42 2002 > @@ -236,13 +236,15 @@ > { > if (make_backups && !make_backup(fname)) > return; > + /* eric: set permisions before moving file */ > + set_perms(fnametmp, file, NULL, 0); > > /* move tmp file over real file */ > if (robust_rename(fnametmp,fname) != 0) { >...

...are: x86 OS: Linux Status: NEW Severity: enhancement Priority: P5 Component: core Assignee: wayned at samba.org Reporter: ryuta at caramail.com QA Contact: rsync-qa at samba.org rsync show me : rsync: delete_file: make_backup(...) failed: No space left on device (28) rsync: delete_file: make_backup(...) failed: No space left on device (28) ... in output. Rsync is right, but I would like it to stop on first error, because I think that it isn't necessary that it populate my log moreover and use my CPU and my network v...

...- we do some testing on them and we receive errors, when file already copied and renamed from tempfile, but permission are not yet set. So I fixed it with following diff: --- rsync.c.orig Fri Jul 19 13:37:25 2002 +++ rsync.c Fri Jul 19 13:36:42 2002 @@ -236,13 +236,15 @@ { if (make_backups && !make_backup(fname)) return; + /* eric: set permisions before moving file */ + set_perms(fnametmp, file, NULL, 0); /* move tmp file over real file */ if (robust_rename(fnametmp,fname) != 0) { if (errno == EXDEV) {...

.../^X//' << 'SHAR_EOF' > options-priv-backups && X--- options.c.t Fri Jun 21 08:56:31 2002 X+++ options.c Fri Jun 21 09:41:41 2002 X@@ -21,6 +21,9 @@ X #include "rsync.h" X #include "popt.h" X X+#ifdef HAVE_CHMOD X+int priv_backups = 0; X+#endif X int make_backups = 0; X int whole_file = -1; X int copy_links = 0; X@@ -188,6 +191,7 @@ X rprintf(F," -b, --backup make backups (default %s suffix)\n",BACKUP_SUFFIX); X rprintf(F," --backup-dir make backups into this directory\n"); X rprintf(F," --su...

...-don -------------- next part -------------- Only in rsync-2.4.6-direct-write/lib: dummy diff -ru rsync-2.4.6/options.c rsync-2.4.6-direct-write/options.c --- rsync-2.4.6/options.c Tue Sep 5 19:46:43 2000 +++ rsync-2.4.6-direct-write/options.c Sun Nov 11 10:40:01 2001 @@ -22,6 +22,7 @@ int make_backups = 0; +int direct_write = 0; int whole_file = 0; int copy_links = 0; int preserve_links = 0; @@ -147,6 +148,7 @@ rprintf(F," --ignore-errors delete even if there are IO errors\n"); rprintf(F," --max-delete=NUM don't delete more than NUM files\n&quo...

...the destination\&. diff -Naur rsync-2.6.1pre2/rsync.c rsync-inplace/rsync.c --- rsync-2.6.1pre2/rsync.c 2004-03-24 03:16:15.000000000 +1100 +++ rsync-inplace/rsync.c 2004-04-22 09:16:49.000000000 +1000 @@ -33,6 +33,7 @@ extern int preserve_gid; extern int preserve_perms; extern int make_backups; +extern int inplace; /* @@ -235,6 +236,11 @@ if (make_backups && !make_backup(fname)) return; + if (inplace) { + set_perms(fname,file,NULL,0); + return; + } + /* move tmp file over real file */ ret = ro...

...e_mdays!=-1 && file_modtime>mday_time){ - if(verbose) - rprintf(FINFO, - "not deleting %s, age %d days, need %d days\n", - safe_fname(f), - (int)(now_time-file_modtime)/24/60/60, - delete_mdays); - continue; - } - - if (make_backups && (backup_dir || !is_backup_file(f))) { make_backup(f); if (verbose) { rprintf(FINFO, "deleting %s\n", safe_fname(f)); --- 118,129 ---- -- +------------------------------------------------------------+ | Marko Riedel, EDV Neue Arbeit gGmbH, mrie...

...otal size is 26,763,596 speedup is 17,878.15 and an exit status of 0 despite the error. the file-to-be-modified remains unchanged, and the rsync tmpfile that is transferred over is left in place. subsequent runs of the command also fail, but with an exit value of 23 (i'm guessing because the make_backup reports failing as well as the "backup mkdir"?): > receiving incremental file list > rsync: backup mkdir /2/tmp/McGillLibrary-129621-5035 failed: No space left on device (28) > rsync: delete_file: make_backup(McGillLibrary-129621-5035/.129621_scandata.xml.nKW4Sg) failed: Success...

Kudos all that maintain this awesome and enduring piece of software. Awesome job, many thanks. I’ve come across a use case that would greatly benefit form a —delete-older-than <secs> argument. This would behave the same as —delete only sparing files dest that have a creating time less than <secs> ago. How hard would this be to implement? Where would I start ? TIA, Francois

All callers of robust_rename() call copy_file() if EXDEV is received. This patch moves the copy_file() call into robust_rename(). Patch Summary: -12 +1 backup.c -15 +2 rsync.c -9 +33 util.c -------------- next part -------------- patchwork diff util.c --- util.c 2004-02-17 09:58:44.000000000 -0500 +++ util.c 2004-02-17 10:21:22.000000000 -0500 @@ -355,16 +355,40 @@