Skip to content

Commit

Permalink
Revert "depsolve: filter out conflicting provider. BZ 1480065"
Browse files Browse the repository at this point in the history
This didn't handle the case where *all* of the providers conflict with
reqpo and therefore produce an empty pkgs list on which we later call
max() and traceback.  I'll rework this in the next commit.

This reverts commit ae2d51b.
  • Loading branch information
dmnks committed Feb 12, 2020
1 parent a866ccd commit 8483bc7
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions yum/depsolve.py
Expand Up @@ -1556,13 +1556,6 @@ def _pkg2prov_version(pkg, provname):
continue
unique_nevra_pkgs[pkg.pkgtup] = pkg
pkgs = unique_nevra_pkgs.values()

# Do a conflict filtering; get rid of those pkgs that reqpo conflicts
# with
if reqpo is not None:
pkgs = [pkg for pkg in pkgs
if not any(pkg.checkPrco('provides', conflict)
for conflict in reqpo.conflicts)]

pkgresults = {}

Expand Down

0 comments on commit 8483bc7

Please sign in to comment.