git.samba.org
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bf350d7
)
Fixed improper deletion of mount-point hierarchies.
author
Wayne Davison
<wayned@samba.org>
Wed, 1 Apr 2009 03:15:42 +0000
(20:15 -0700)
committer
Wayne Davison
<wayned@samba.org>
Wed, 1 Apr 2009 03:26:10 +0000
(20:26 -0700)
Fixes bug #6240.
NEWS
patch
|
blob
|
history
flist.c
patch
|
blob
|
history
diff --git
a/NEWS
b/NEWS
index d2acdbd781bbecf833a2021c46e18da7e05990f1..f8ef1725034889fc240f0dbcb4a770901b428b4f 100644
(file)
--- a/
NEWS
+++ b/
NEWS
@@
-28,6
+28,10
@@
Changes since 3.0.5:
- Fixed the --iconv conversion of symlinks when doing a local copy.
- Fixed the --iconv conversion of symlinks when doing a local copy.
+ - Fixed a problem where --one-file-system was not stopping deletions on the
+ receiving side when a mount-point directory did not match a directory in
+ the transfer.
+
- Fixed configure's erroneous use of target.
- Fixed configure's --disable-debug option.
- Fixed configure's erroneous use of target.
- Fixed configure's --disable-debug option.
diff --git
a/flist.c
b/flist.c
index bc4eb45ed60c634d8261bc37284858be679593e0..a6107b485a3e35f033ef585433f3e6dcfce93097 100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-3007,7
+3007,7
@@
struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
recurse = 0;
xfer_dirs = 1;
recurse = 0;
xfer_dirs = 1;
- send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen,
0
);
+ send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen,
FLAG_CONTENT_DIR
);
xfer_dirs = save_xfer_dirs;
recurse = save_recurse;
if (do_progress)
xfer_dirs = save_xfer_dirs;
recurse = save_recurse;
if (do_progress)