diff options
Diffstat (limited to 'pyanaconda')
| -rw-r--r-- | pyanaconda/__init__.py | 3 | ||||
| -rw-r--r-- | pyanaconda/cmdline.py | 1 | ||||
| -rw-r--r-- | pyanaconda/exception.py | 1 | ||||
| -rw-r--r-- | pyanaconda/installclass.py | 64 | ||||
| -rw-r--r-- | pyanaconda/kickstart.py | 1 | ||||
| -rw-r--r-- | pyanaconda/rescue.py | 1 |
6 files changed, 1 insertions, 70 deletions
diff --git a/pyanaconda/__init__.py b/pyanaconda/__init__.py index 4a4be2a67..58ec85253 100644 --- a/pyanaconda/__init__.py +++ b/pyanaconda/__init__.py @@ -43,7 +43,7 @@ _ = lambda x: gettext.ldgettext("anaconda", x) class Anaconda(object): def __init__(self): - import desktop, dispatch, firewall, security + import desktop, firewall, security import system_config_keyboard.keyboard as keyboard from flags import flags @@ -52,7 +52,6 @@ class Anaconda(object): self.canReIPL = False self.desktop = desktop.Desktop() self.dir = None - self.dispatch = dispatch.Dispatcher(self) self.displayMode = None self.extraModules = [] self.firewall = firewall.Firewall() diff --git a/pyanaconda/cmdline.py b/pyanaconda/cmdline.py index eb05e98ba..7c11ccff7 100644 --- a/pyanaconda/cmdline.py +++ b/pyanaconda/cmdline.py @@ -153,7 +153,6 @@ class InstallInterface(InstallInterfaceBase): def run(self, anaconda): self.anaconda = anaconda - self.anaconda.dispatch.dispatch() def display_step(self, step): if stepToClasses.has_key(step): diff --git a/pyanaconda/exception.py b/pyanaconda/exception.py index 5c901669a..47ccd1e4b 100644 --- a/pyanaconda/exception.py +++ b/pyanaconda/exception.py @@ -121,7 +121,6 @@ def initExceptionHandling(anaconda): "accounts", "bootloader.password", "comps", - "dispatch", "hdList", "ksdata", "instLanguage.font", diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py index 144df917b..3f291059a 100644 --- a/pyanaconda/installclass.py +++ b/pyanaconda/installclass.py @@ -81,70 +81,6 @@ class BaseInstallClass(object): def postAction(self, anaconda): anaconda.backend.postAction(anaconda) - def setSteps(self, anaconda): - dispatch = anaconda.dispatch - dispatch.schedule_steps( - "language", - "keyboard", - "filtertype", - "filter", - "storageinit", - "findrootparts", - "betanag", - "cleardiskssel", - "parttype", - "autopartitionexecute", - "storagedone", - "bootloader", - "network", - "timezone", - "accounts", - "reposetup", - "basepkgsel", - "tasksel", - "postselection", - "reipl", - "install", - "enablefilesystems", - "setuptime", - "preinstallconfig", - "installpackages", - "postinstallconfig", - "writeconfig", - "firstboot", - "instbootloader", - "dopostaction", - "methodcomplete", - "complete" - ) - - if isFinal: - dispatch.skip_steps("betanag") - - if iutil.isEfi() or not iutil.isX86(): - dispatch.skip_steps("bootloader") - - # allow backends to disable interactive package selection - if not anaconda.backend.supportsPackageSelection: - dispatch.skip_steps("tasksel") - dispatch.skip_steps("group-selection") - - # allow install classes to turn off the upgrade - if not self.showUpgrade or not anaconda.backend.supportsUpgrades: - dispatch.skip_steps("findrootparts") - - # 'noupgrade' can be used on the command line to force not looking - # for partitions to upgrade. useful in some cases... - if flags.cmdline.has_key("noupgrade"): - dispatch.skip_steps("findrootparts") - - # upgrade will also always force looking for an upgrade. - if flags.cmdline.has_key("upgrade"): - dispatch.request_steps("findrootparts") - - # allow interface backends to skip certain steps. - map(lambda s: dispatch.skip_steps(s), anaconda.intf.unsupported_steps()) - # modifies the uri from installmethod.getMethodUri() to take into # account any installclass specific things including multiple base # repositories. takes a string or list of strings, returns a dict diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 8a74713cc..80082e6f4 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -1157,7 +1157,6 @@ class Timezone(commands.timezone.F18_Timezone): log.warning("Timezone %s set in kickstart is not valid." % (self.timezone,)) self.anaconda.timezone.setTimezoneInfo(self.timezone, self.isUtc) - self.anaconda.dispatch.skip_steps("timezone") chronyd_conf_path = os.path.normpath(ROOT_PATH + ntp.NTP_CONFIG_FILE) ntp.save_servers_to_config(self.ntpservers, diff --git a/pyanaconda/rescue.py b/pyanaconda/rescue.py index 4a173906c..5854e25a1 100644 --- a/pyanaconda/rescue.py +++ b/pyanaconda/rescue.py @@ -117,7 +117,6 @@ class RescueInterface(InstallInterfaceBase): def run(self, anaconda): self.anaconda = anaconda - self.anaconda.dispatch.dispatch() def __init__(self): InstallInterfaceBase.__init__(self) |