Unbreak conflicts from commit 1f46534b5444dda77e3a2c757f7c88c5ec93dba0

- only call solve callback on requires, conflicts have satisfied/unsatisfied
  status backwards here

diff --git a/lib/depends.c b/lib/depends.c
index 3aeab18..18628ae 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -436,16 +436,18 @@ retry:
     }
 
     /*
-     * Search for an unsatisfied dependency.
+     * Search for an unsatisfied dependency (requires only).
      */
     if (adding && !retrying && !(rpmtsFlags(ts) & RPMTRANS_FLAG_NOSUGGEST)) {
-       xx = rpmtsSolve(ts, dep);
-       if (xx == 0)
-           goto exit;
-       if (xx == -1) {
-           retrying = 1;
-           rpmalMakeIndex(tsmem->addedPackages);
-           goto retry;
+       if (rpmdsTagN(dep) == RPMTAG_REQUIRENAME) {
+           xx = rpmtsSolve(ts, dep);
+           if (xx == 0)
+               goto exit;
+           if (xx == -1) {
+               retrying = 1;
+               rpmalMakeIndex(tsmem->addedPackages);
+               goto retry;
+           }
        }
     }