diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | dispatch.py | 10 | ||||
| -rwxr-xr-x | gui.py | 6 |
3 files changed, 10 insertions, 10 deletions
@@ -25,6 +25,10 @@ * anaconda.spec: netpbm-tools -> netpbm-progs. * autopart.py: Simplify error handling and return values. + (doAutoPartition): Fix up a nonsensical error message. + + * dispatch.py: Fix handling of dir yet again. + * gui.py: We don't need yet another dir variable. 2006-06-08 Jeremy Katz <katzj@redhat.com> diff --git a/dispatch.py b/dispatch.py index 58727df16..5967fe38b 100644 --- a/dispatch.py +++ b/dispatch.py @@ -185,7 +185,7 @@ class Dispatcher: if self.step == None: self.step = self.firstStep else: - self.step = self.step + self.dir + self.step = self.step + self._getDir() if self.step >= len(installSteps): return None @@ -195,13 +195,13 @@ class Dispatcher: if self.stepIsDirect(self.step) and not self.stepInSkipList(self.step): (stepName, stepFunc) = installSteps[self.step] - log.info("moving (%d) to step %s" %(self.dir, stepName)) + log.info("moving (%d) to step %s" %(self._getDir(), stepName)) rc = stepFunc(self.anaconda) if rc in [DISPATCH_BACK, DISPATCH_FORWARD]: - self.dir = rc + self._setDir(rc) # if anything else, leave self.dir alone - self.step = self.step + self.dir + self.step = self.step + self._getDir() if self.step == len(installSteps): return None @@ -214,7 +214,7 @@ class Dispatcher: self.step = len(installSteps) - 1 while self.skipSteps.has_key(installSteps[self.step][0]): self.step = self.step - 1 - log.info("moving (%d) to step %s" %(self.dir, installSteps[self.step][0])) + log.info("moving (%d) to step %s" %(self._getDir(), installSteps[self.step][0])) def currentStep(self): if self.step == None: @@ -864,8 +864,6 @@ class InstallControlWindow: return self.anaconda.dispatch.gotoPrev() - self.dir = DISPATCH_BACK - self.setScreen () def nextClicked (self, *args): @@ -875,8 +873,6 @@ class InstallControlWindow: return self.anaconda.dispatch.gotoNext() - self.dir = DISPATCH_FORWARD - self.setScreen () def releaseNotesButtonClicked (self, widget): @@ -919,7 +915,7 @@ class InstallControlWindow: return if not stepToClass[step]: - if self.dir == 1: + if self.anaconda.dispatch.dir == DISPATCH_FORWARD: return self.nextClicked() else: return self.prevClicked() |