Doh, not-enough-caffeine thinko in 685bf3b6ef32bc49393d1f287b7ecf3e6d21ab09

(cherry picked from commit e97bccbd78233d6af9175f274a928e897d790550)

diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 6177e6f..5c032c2 100644 (file)
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -500,7 +500,7 @@ int rpmfiCompareIndex(rpmfi afi, int aix, rpmfi bfi, int bix)
        (rpmfiFFlagsIndex(bfi, bix) & RPMFILE_GHOST)) return 0;
 
     /* Mode difference is a conflict, except for symlinks */
-    if ((awhat != LINK && rpmfiWhatis(bmode) != LINK) && amode != bmode)
+    if (!(awhat == LINK && rpmfiWhatis(bmode) == LINK) && amode != bmode)
        return 1;
 
     if (awhat == LINK || awhat == REG) {