Enforce conflicts on colorless files always

- silently swallowing conflicting files when they happen to be in the
  same (suitable colored) transaction but conflicting when installed
  separately is nothing but inconsistent
- partial fix for rhbz#190209

diff --git a/lib/transaction.c b/lib/transaction.c
index 5501fe5..7e432a3 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -514,12 +514,6 @@ assert(otherFi != NULL);
                            otherFi->actions[otherFileNum] = FA_CREATE;
                        fi->actions[i] = FA_SKIPCOLOR;
                        rConflicts = 0;
-                   } else
-                   if (FColor == 0 && oFColor == 0) {
-                       /* ... otherwise, do both, last in wins. */
-                       otherFi->actions[otherFileNum] = FA_CREATE;
-                       fi->actions[i] = FA_CREATE;
-                       rConflicts = 0;
                    }
                    done = 1;
                }