summaryrefslogtreecommitdiffstats
path: root/comps.py
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>1999-09-27 18:00:59 +0000
committerMatt Wilson <msw@redhat.com>1999-09-27 18:00:59 +0000
commit9903524672dc375c5dad43e14f723dc8eb8c1d85 (patch)
tree0e470dbf060bf86d865a9cd3fa4dd0c8bb65346a /comps.py
parent07ac270b046ee2918e6f94e7b1c8d99ce8fb287b (diff)
downloadanaconda-9903524672dc375c5dad43e14f723dc8eb8c1d85.tar.gz
anaconda-9903524672dc375c5dad43e14f723dc8eb8c1d85.tar.xz
anaconda-9903524672dc375c5dad43e14f723dc8eb8c1d85.zip
three jj patches
Diffstat (limited to 'comps.py')
-rw-r--r--comps.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/comps.py b/comps.py
index 16cef771f..07f2118be 100644
--- a/comps.py
+++ b/comps.py
@@ -11,7 +11,8 @@ XFreeServerPackages = { 'XFree86-3DLabs' : 1, 'XFree86-8514' : 1,
'XFree86-Mach8' : 1, 'XFree86-Mono' : 1,
'XFree86-P9000' : 1, 'XFree86-S3' : 1,
'XFree86-S3V' : 1, 'XFree86-SVGA' : 1,
- 'XFree86-W32' : 1 }
+ 'XFree86-W32' : 1, 'XFree86-Sun' : 1,
+ 'XFree86-SunMono' : 1, 'XFree86-Sun24' : 1 }
class Package:
def __getitem__(self, item):
@@ -228,7 +229,8 @@ class ComponentSet:
comp = Component(l, default == '1', hidden)
elif (l == "}"):
if conditional:
- conditional.dependents.append (comp)
+ if comp.conditional.has_key (conditional):
+ conditional.dependents.append (comp)
conditional = None
else:
self.comps.append(comp)