diff options
| author | jbj <devnull@localhost> | 2003-01-03 21:30:33 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2003-01-03 21:30:33 +0000 |
| commit | 0fef0de4041cab4b97979c15d9da5ed445e8f53e (patch) | |
| tree | 94cb59622494ac4e622fe9149b70425218a7d6b0 | |
| parent | ed806144245212853f1bd030981d967bfe77630e (diff) | |
| download | rpm-0fef0de4041cab4b97979c15d9da5ed445e8f53e.tar.gz rpm-0fef0de4041cab4b97979c15d9da5ed445e8f53e.tar.bz2 rpm-0fef0de4041cab4b97979c15d9da5ed445e8f53e.zip | |
fix: inverted logic in RPMPROB_FILTER_REPLACENEWFILES filtering.
CVS patchset: 5995
CVS date: 2003/01/03 21:30:33
| -rw-r--r-- | lib/transaction.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/transaction.c b/lib/transaction.c index bc3dc9edc..48dae67da 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -604,7 +604,7 @@ static void handleOverlappedFiles(const rpmts ts, assert(otherFi != NULL); /* Mark added overlapped non-identical files as a conflict. */ - if ((rpmtsFilterFlags(ts) & RPMPROB_FILTER_REPLACENEWFILES) + if (!(rpmtsFilterFlags(ts) & RPMPROB_FILTER_REPLACENEWFILES) && filecmp(otherFi, fi)) { rpmpsAppend(ps, RPMPROB_NEW_FILE_CONFLICT, |