summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>2001-08-23 19:37:47 +0000
committerMatt Wilson <msw@redhat.com>2001-08-23 19:37:47 +0000
commit56704c29a953deb45c098cd220f8621c6761a3b2 (patch)
treeaf6872ea8105f03e33f0f14ee98bede1e17296e3
parentee68107c4e9049f1d71c428ea538c683b6985792 (diff)
downloadanaconda-56704c29a953deb45c098cd220f8621c6761a3b2.tar.gz
anaconda-56704c29a953deb45c098cd220f8621c6761a3b2.tar.xz
anaconda-56704c29a953deb45c098cd220f8621c6761a3b2.zip
fix broken conflict handling when the problem is all in the installed db
-rw-r--r--comps.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/comps.py b/comps.py
index e1bab353a..77ae562d5 100644
--- a/comps.py
+++ b/comps.py
@@ -685,7 +685,10 @@ class ComponentSet:
try:
h = self.packages[reqname].h
except KeyError:
- conflicts = 0
+ # we don't actually have the conflicting package
+ # in our available packages, the conflict is
+ # on the system. Continue on.
+ continue
installed = ("", h[rpm.RPMTAG_VERSION],
h [rpm.RPMTAG_RELEASE])
if rpm.labelCompare (installed, needed) >= 0: