Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1661fe9
)
Allow --force to work even if --recurse was not specified.
author
Wayne Davison
<wayned@samba.org>
Mon, 30 Jan 2006 18:35:54 +0000
(18:35 +0000)
committer
Wayne Davison
<wayned@samba.org>
Mon, 30 Jan 2006 18:35:54 +0000
(18:35 +0000)
generator.c
patch
|
blob
|
blame
|
history
diff --git
a/generator.c
b/generator.c
index
74cfd6a
..
97395a7
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-144,7
+144,7
@@
static int delete_item(char *fname, int mode, int flags)
return -1;
}
- zap_dir = flags & DEL_FORCE_RECURSE ||
(force_delete && recurse)
;
+ zap_dir = flags & DEL_FORCE_RECURSE ||
force_delete
;
if ((max_delete && ++deletion_count > max_delete)
|| (dry_run && zap_dir)) {
ok = 0;