diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2011-05-26 11:40:55 +0300 |
|---|---|---|
| committer | Panu Matilainen <Panu Matilainen pmatilai@redhat.com> | 2011-07-15 12:15:12 +0300 |
| commit | 9d80b498e16603dbe3d1402f1945432a16dc7fd8 (patch) | |
| tree | 17366a694a52715556ae84ada2c1423dbafc54d1 | |
| parent | b5bc5c9e21f7c12e08002a8d50e97340ce09344a (diff) | |
| download | rpm-9d80b498e16603dbe3d1402f1945432a16dc7fd8.tar.gz | |
Both files must be colored for multilib conflict resolution (RhBug:705115)
- File conflicts should only be resolved to preferred color when
both files are colored. Prior to this we would happily overwrite
scripts with a clearly conflicting ELF binary.
(cherry picked from commit 7bbc9b073d9204f6ffb8a1091c189b80029d27a9)
| -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 12eaf4901..aee83a0cc 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -344,7 +344,7 @@ static int handleInstInstalledFile(const rpmts ts, rpmte p, rpmfi fi, rConflicts = !(beingRemoved || (rpmtsFilterFlags(ts) & RPMPROB_FILTER_REPLACEOLDFILES)); /* Resolve file conflicts to prefer Elf64 (if not forced). */ - if (tscolor != 0 && FColor != 0 && FColor != oFColor) { + if (tscolor != 0 && FColor != 0 && oFColor != 0 && FColor != oFColor) { if (oFColor & prefcolor) { rpmfsSetAction(fs, fx, FA_SKIPCOLOR); rConflicts = 0; |