Colored conflict resolution part II

- Same as commit 7bbc9b073d9204f6ffb8a1091c189b80029d27a9 but
  within the to-be-installed set

diff --git a/lib/transaction.c b/lib/transaction.c
index 1d20100..2700ce6 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -506,7 +506,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)))