projects
/
platform
/
upstream
/
rpm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ed80614
)
fix: inverted logic in RPMPROB_FILTER_REPLACENEWFILES filtering.
author
jbj
<devnull@localhost>
Fri, 3 Jan 2003 21:30:33 +0000
(21:30 +0000)
committer
jbj
<devnull@localhost>
Fri, 3 Jan 2003 21:30:33 +0000
(21:30 +0000)
CVS patchset: 5995
CVS date: 2003/01/03 21:30:33
lib/transaction.c
patch
|
blob
|
history
diff --git
a/lib/transaction.c
b/lib/transaction.c
index
bc3dc9e
..
48dae67
100644
(file)
--- 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,