summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2004-12-20 17:42:45 +0000
committerJeremy Katz <katzj@redhat.com>2004-12-20 17:42:45 +0000
commit3293d251f61c6c1fba2015a7af102c8efeb462c6 (patch)
tree7ac64291bad474544524bef1ec2c175dc3457176
parent0479b520f7659da2e2d6567cc9a28e65fa8856df (diff)
downloadanaconda-3293d251f61c6c1fba2015a7af102c8efeb462c6.tar.gz
anaconda-3293d251f61c6c1fba2015a7af102c8efeb462c6.tar.xz
anaconda-3293d251f61c6c1fba2015a7af102c8efeb462c6.zip
2004-12-20 Jeremy Katz <katzj@redhat.com>
* packages.py (doPreInstall): Some finagling for kernel-*devel handling (#143257)
-rw-r--r--ChangeLog5
-rw-r--r--packages.py9
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cb5c51dd1..8b2a7e10e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-20 Jeremy Katz <katzj@redhat.com>
+
+ * packages.py (doPreInstall): Some finagling for kernel-*devel
+ handling (#143257)
+
2004-12-16 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version.
diff --git a/packages.py b/packages.py
index 25c505a05..0a13df4f6 100644
--- a/packages.py
+++ b/packages.py
@@ -626,11 +626,18 @@ def doPreInstall(method, id, intf, instPath, dir):
return 1
return 0
+ def selected(hdrlist, name):
+ if hdrlist.has_key(name) and hdrlist[name].isSelected():
+ return 1
+ return 0
+
if not upgrade:
foundkernel = 0
if isys.smpAvailable() or isys.htavailable():
if select(id.grpset.hdrlist, 'kernel-smp'):
foundkernel = 1
+ if selected(id.grpset.hdrlist, "gcc"):
+ select("kernel-smp-devel")
if iutil.needsEnterpriseKernel():
if select(id.grpset.hdrlist, "kernel-bigmem"):
@@ -643,6 +650,8 @@ def doPreInstall(method, id, intf, instPath, dir):
if foundkernel == 0:
# we *always* need to have some sort of kernel installed
select(id.grpset.hdrlist, 'kernel')
+ if selected(id.grpset.hdrlist, "gcc"):
+ select("kernel-devel")
# if NIS is configured, install ypbind and dependencies:
if id.auth.useNIS: