summaryrefslogtreecommitdiffstats
path: root/kickstart.py
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-07-31 19:29:34 +0000
committerChris Lumens <clumens@redhat.com>2007-07-31 19:29:34 +0000
commit700c5397ede5933654af5465b42db3d383f25760 (patch)
treecb3ae526f86273388e863e734fd63a8079c8dc68 /kickstart.py
parent0c97af4e79a059a414b479b8e8668f93a0ca293f (diff)
downloadanaconda-700c5397ede5933654af5465b42db3d383f25760.tar.gz
anaconda-700c5397ede5933654af5465b42db3d383f25760.tar.xz
anaconda-700c5397ede5933654af5465b42db3d383f25760.zip
Back out some stuff that shouldn't have been committed yet.
Diffstat (limited to 'kickstart.py')
-rw-r--r--kickstart.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/kickstart.py b/kickstart.py
index c23bb7607..a225d66b0 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -1040,7 +1040,13 @@ def setSteps(anaconda):
# If the package section included anything, skip group selection unless
# they're in interactive.
- if havePackages(ksdata.packages):
+ if ksdata.upgrade.upgrade:
+ ksdata.skipSteps.append("group-selection")
+
+ # Special check for this, since it doesn't make any sense.
+ if ksdata.packages.seen:
+ warnings.warn("Ignoring contents of %packages section due to upgrade.")
+ elif havePackages(ksdata.packages):
if interactive:
ksdata.showSteps.append("group-selection")
else: