diff options
author | Chris Lumens <clumens@redhat.com> | 2012-05-23 14:19:08 -0400 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2012-05-23 16:22:17 -0400 |
commit | 2a575c453c31d99da3e04950d91015761426c0b8 (patch) | |
tree | 2cc6a8d405c8d03829033afa78535b77fe7aa5e0 | |
parent | 71cc06abcedb056a2906905bfd28ec2fa52c1e29 (diff) | |
download | anaconda-2a575c453c31d99da3e04950d91015761426c0b8.tar.gz anaconda-2a575c453c31d99da3e04950d91015761426c0b8.tar.xz anaconda-2a575c453c31d99da3e04950d91015761426c0b8.zip |
Remove places that import upgrade unnecessarily.
upgrade is bringing in findExistingRootDevices, which no longer exists. I
could instead fix upgrade, but we are going to fix it in a far more
comprehensive manner later by moving it out of anaconda. Thus there's no
need to deal with it here now.
-rw-r--r-- | pyanaconda/dispatch.py | 9 | ||||
-rw-r--r-- | pyanaconda/kickstart.py | 80 | ||||
-rw-r--r-- | pyanaconda/rescue.py | 1 |
3 files changed, 0 insertions, 90 deletions
diff --git a/pyanaconda/dispatch.py b/pyanaconda/dispatch.py index f27a6ae7b..fcf8861dc 100644 --- a/pyanaconda/dispatch.py +++ b/pyanaconda/dispatch.py @@ -33,10 +33,6 @@ from storage import storageComplete from storage.partitioning import doAutoPartition from bootloader import writeBootLoader from flags import flags -from upgrade import upgradeMountFilesystems -from upgrade import restoreTime -from upgrade import upgradeMigrateFind -from upgrade import findRootParts, queryUpgradeContinue from installmethod import doMethodComplete from sshd import doSshd from rescue import doRescue @@ -252,7 +248,6 @@ class Dispatcher(object): self.add_step("filtertype") self.add_step("filter") self.add_step("storageinit", storageInitialize) - self.add_step("findrootparts", findRootParts) self.add_step("findinstall") self.add_step("network") self.add_step("timezone") @@ -262,10 +257,6 @@ class Dispatcher(object): self.add_step("cleardiskssel") self.add_step("autopartitionexecute", doAutoPartition) self.add_step("partition") - self.add_step("upgrademount", upgradeMountFilesystems) - self.add_step("restoretime", restoreTime) - self.add_step("upgradecontinue", queryUpgradeContinue) - self.add_step("upgrademigfind", upgradeMigrateFind) self.add_step("upgrademigratefs") self.add_step("storagedone", storageComplete) self.add_step("upgbootloader") diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 3a6a20c8b..935b9c2a3 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -42,7 +42,6 @@ from constants import * import sys import urlgrabber import network -import upgrade import pykickstart.commands as commands from storage.devices import * from scdate.core import zonetab @@ -1335,82 +1334,3 @@ def selectPackages(ksdata, payload): payload.deselectGroup(grp.name) except NoSuchGroup: continue - -def setSteps(anaconda): - def havePackages(packages): - return len(packages.groupList) > 0 or len(packages.packageList) > 0 or \ - len(packages.excludedList) > 0 or len(packages.excludedGroupList) > 0 - - dispatch = anaconda.dispatch - ksdata = anaconda.ksdata - - if ksdata.upgrade.upgrade: - upgrade.setSteps(anaconda) - - # we have no way to specify migrating yet - dispatch.skip_steps("upgrademigfind") - dispatch.skip_steps("upgrademigratefs") - dispatch.skip_steps("upgradecontinue") - dispatch.skip_steps("findinstall") - dispatch.skip_steps("language") - dispatch.skip_steps("keyboard") - dispatch.skip_steps("betanag") - else: - anaconda.instClass.setSteps(anaconda) - dispatch.skip_steps("findrootparts") - dispatch.request_steps("kickstart") - - dispatch.skip_steps("betanag") - dispatch.skip_steps("network") - - # Storage is initialized for us right when kickstart processing starts. - dispatch.skip_steps("storageinit") - - # Make sure to automatically reboot if told to. - if ksdata.reboot.action in [KS_REBOOT, KS_SHUTDOWN]: - dispatch.skip_steps("complete") - - # If the package section included anything, skip group selection. - if ksdata.upgrade.upgrade: - dispatch.skip_steps("tasksel", "group-selection") - - # Special check for this, since it doesn't make any sense. - if packagesSeen: - log.warning("Ignoring contents of %packages section due to upgrade.") - elif havePackages(ksdata.packages): - dispatch.skip_steps("tasksel", "group-selection") - else: - if packagesSeen: - dispatch.skip_steps("tasksel", "group-selection") - else: - dispatch.request_steps("tasksel") - - if ksdata.ignoredisk.interactive: - dispatch.request_steps("filtertype", "filter") - else: - # Since ignoredisk is optional and not specifying it means you want to - # consider all possible disks, we should not stop on the filter steps - # unless we've been told to. - dispatch.skip_steps("filtertype", "filter") - - # Text mode doesn't have all the steps that graphical mode does, so we - # can't stop and prompt for missing information. Make sure we've got - # everything that would be provided by a missing section now and error - # out if we don't. - if anaconda.displayMode == "t": - missingSteps = [("bootloader", "Bootloader configuration"), - ("filter", "Disks to use in installation"), - ("cleardiskssel", "Disks to clear"), - ("group-selection", "Package selection")] - errors = [] - - for (step, msg) in missingSteps: - if dispatch.step_enabled(step): - errors.append(msg) - - if len(errors) > 0: - anaconda.intf.kickstartErrorWindow(_("The kickstart configuration " - "file is missing required information that anaconda cannot " - "prompt for. Please add the following sections and try " - "again:\n%s") % ", ".join(errors)) - sys.exit(0) diff --git a/pyanaconda/rescue.py b/pyanaconda/rescue.py index 904b78e63..4a173906c 100644 --- a/pyanaconda/rescue.py +++ b/pyanaconda/rescue.py @@ -20,7 +20,6 @@ # Jeremy Katz <katzj@redhat.com> # -import upgrade from snack import * from constants import * from textw.constants_text import * |