[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH rhel6-branch master] Don't autostep past the end of the install screens (#593556)



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ack.

On Wed, 19 May 2010, Brian C. Lane wrote:

moveStep was allowing the step to be incremented past the end of the
install. This was causing the traceback when it tried to log that it
was leaving a non-existant screen.

This fixes it by checking the limit on the step before logging,
and again after incrementing.

Resolves: rhbz#593556
---
dispatch.py |    7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index 5bcaab9..0fde47a 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -189,11 +189,14 @@ class Dispatcher(object):
	if self.step == None:
	    self.step = self.firstStep
	else:
+            if self.step >= len(installSteps):
+                return None
+
            log.info("leaving (%d) step %s" %(self._getDir(), installSteps[self.step][0]))
            self.step = self.step + self._getDir()

-	if self.step >= len(installSteps):
-	    return None
+            if self.step >= len(installSteps):
+                return None

        while self.step >= self.firstStep and self.step < len(installSteps) \
            and (self.stepInSkipList(self.step) or self.stepIsDirect(self.step)):


- -- David Cantrell <dcantrell redhat com>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)

iEYEARECAAYFAkv0p1gACgkQ5hsjjIy1VkkTtgCdEDdiAj6kmq90MlkZ5VNlwSU7
9jkAoOfjwlbwnliNfM/5o19bt7mhrrLG
=wd98
-----END PGP SIGNATURE-----


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]