diff options
| author | David Cantrell <dcantrell@redhat.com> | 2007-03-27 15:59:04 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2007-03-27 15:59:04 +0000 |
| commit | 4d178b1fccbca82b235acbb98f58ea630c8f2acb (patch) | |
| tree | 14da9b52d14bf590935146ab20c1cde9e0695cec /textw/network_text.py | |
| parent | d0eafdcf15572467fe74bcbfb5809b200d240381 (diff) | |
| download | anaconda-4d178b1fccbca82b235acbb98f58ea630c8f2acb.tar.gz anaconda-4d178b1fccbca82b235acbb98f58ea630c8f2acb.tar.xz anaconda-4d178b1fccbca82b235acbb98f58ea630c8f2acb.zip | |
* textw/network_text.py: Do not call screen.popWindow() if we get
INSTALL_OK or INSTALL_BACK from chooseNetworkDevice() as that causes
the next window to not be displayed.
Diffstat (limited to 'textw/network_text.py')
| -rw-r--r-- | textw/network_text.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/textw/network_text.py b/textw/network_text.py index 5e3111117..29bf2c2f5 100644 --- a/textw/network_text.py +++ b/textw/network_text.py @@ -26,6 +26,9 @@ from constants_text import * from constants import * from rhpl.translate import _ +import logging +log = logging.getLogger("anaconda") + def handleIPError(screen, field, msg): try: newfield = descr[field] @@ -561,14 +564,14 @@ class NetworkDeviceWindow: # collect configuration data for each interface selected by the user doConf = True - while 1: + while doConf is True: if len(self.devices) == 1 and doConf is False: return INSTALL_OK dev = self.chooseNetworkDevice(screen) if dev == INSTALL_OK or dev == INSTALL_BACK: - screen.popWindow() + doConf = False return dev descr = dev.get('desc') @@ -639,6 +642,9 @@ class NetworkDeviceWindow: if len(self.devices) == 1 and doConf is True: doConf = False + screen.popWindow() + return INSTALL_OK + class NetworkGlobalWindow: def __call__(self, screen, anaconda, showonboot = 1): |