Unbreak obsoletes from commit b1a4b57315d31ba98bc0e5803db1ebc2517f6bb5
authorPanu Matilainen <pmatilai@redhat.com>
Wed, 13 Apr 2011 07:04:28 +0000 (10:04 +0300)
committerPanu Matilainen <pmatilai@redhat.com>
Wed, 13 Apr 2011 07:07:33 +0000 (10:07 +0300)
- rpmdsMatchesDep() only works with RPMDBI_PROVIDES, not RPMDBI_NAME.
  Revert that part of the change.

lib/depends.c

index f6a2b62..16df236 100644 (file)
@@ -150,7 +150,7 @@ static void addObsoleteErasures(rpmts ts, tsMembers tsmem, rpm_color_t tscolor,
             * If no obsoletes version info is available, match all names.
             */
            if (rpmdsEVR(obsoletes) == NULL
-                || rpmdsMatchesDep(oh, rpmdbGetIteratorFileNum(mi), obsoletes, _rpmds_nopromote)) {
+                || rpmdsAnyMatchesDep(oh, obsoletes, _rpmds_nopromote)) {
                char * ohNEVRA = headerGetAsString(oh, RPMTAG_NEVRA);
                rpmlog(RPMLOG_DEBUG, "  Obsoletes: %s\t\terases %s\n",
                        rpmdsDNEVR(obsoletes)+2, ohNEVRA);