diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2011-05-26 14:16:14 +0300 |
|---|---|---|
| committer | Panu Matilainen <Panu Matilainen pmatilai@redhat.com> | 2011-07-15 12:15:19 +0300 |
| commit | 0c4b5da8955b9cc364c4490cc43f5ff357bf2ee3 (patch) | |
| tree | 456ed78c5d0c7c36298246888e1983a1250d38e2 | |
| parent | 9d80b498e16603dbe3d1402f1945432a16dc7fd8 (diff) | |
| download | rpm-0c4b5da8955b9cc364c4490cc43f5ff357bf2ee3.tar.gz | |
Colored conflict resolution part II
- Same as commit 7bbc9b073d9204f6ffb8a1091c189b80029d27a9 but
within the to-be-installed set
(cherry picked from commit 75a0d6dcf4a571ddea3857e9e24e3fecc136defd)
| -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 aee83a0cc..7adf60b44 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -508,7 +508,7 @@ assert(otherFi != NULL); rConflicts = reportConflicts; /* Resolve file conflicts to prefer Elf64 (if not forced) ... */ - if (tscolor != 0) { + if (tscolor != 0 && FColor != 0 && oFColor != 0 && FColor != oFColor) { if (FColor & prefcolor) { /* ... last file of preferred colour is installed ... */ if (!XFA_SKIPPING(rpmfsGetAction(fs, i))) |