diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-06-05 20:14:45 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-06-05 20:14:45 +0000 |
| commit | b2972e79c5d11dfa0625bf43838cb65209f7e632 (patch) | |
| tree | ee45296a668255b7ad63dfc0e0963209a7299093 /src/merge.c | |
| parent | 37621a019f8fb5e0ac2e506b45279ab7ba67a167 (diff) | |
* cleanup trash recursively
* ignore some more files
* compile as C99 with -pedantic
* upgrade to Berkeley DB 4.3
* add some tests for rm_rf() and copy_fd()
* remove some minor warnings
* minor fixes
git-svn-id: file:///home/lennart/svn/public/syrep/trunk@76 07ea20a6-d2c5-0310-9e02-9ef735347d72
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index a6c303d..581e8b9 100644 --- a/src/merge.c +++ b/src/merge.c @@ -377,7 +377,7 @@ int merge(struct syrep_db_context *c1, struct syrep_db_context *c2, const char* goto finish; if (!args.keep_trash_flag) - if (rm_rf(cb_info.trash_dir, 0) < 0) + if (rm_rf(cb_info.trash_dir, 1) < 0) goto finish; r = 0; |