diff options
| author |   Preston Cody <codeman@gentoo.org> | 2008-05-04 23:10:44 +0000 |
|---|---|---|
| committer | Preston Cody <codeman@gentoo.org> | 2008-05-04 23:10:44 +0000 |
| commit | 0842be5a029244b789299d251c413228888ad3d6 (patch) | |
| tree | e8d7c79bcb54e802c164f106fed002a7b6400851 | |
| parent | We don't need to extract metadata.tar.bz2 anymore (diff) | |
| download | gli-0842be5a029244b789299d251c413228888ad3d6.tar.gz gli-0842be5a029244b789299d251c413228888ad3d6.tar.bz2 gli-0842be5a029244b789299d251c413228888ad3d6.zip | |
fixing bug 220275 by moving the cancel check
up before trying to assign the variables.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1898 f8877401-5920-0410-a79b-8e2d7e04ca0d
| -rwxr-xr-x | src/fe/dialog/gli-dialog.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fe/dialog/gli-dialog.py b/src/fe/dialog/gli-dialog.py index dc8bd93..5a67246 100755 --- a/src/fe/dialog/gli-dialog.py +++ b/src/fe/dialog/gli-dialog.py @@ -185,9 +185,9 @@ Press OK to continue""") (_(u'Enter a FTP Proxy IP:'), 15), (_(u'Enter a RSYNC Proxy:'),15) )) - (ip_address, broadcast, netmask, gateway, dnsservers, http_proxy, ftp_proxy, rsync_proxy) = data[:-1].split('\n') if code != self._DLG_OK: return + (ip_address, broadcast, netmask, gateway, dnsservers, http_proxy, ftp_proxy, rsync_proxy) = data[:-1].split('\n') if ftp_proxy and ftp_proxy != "": os.environ['ftp_proxy'] = ftp_proxy @@ -1283,9 +1283,9 @@ Press OK to continue""") ((_(u'Enter your IP address:'), 15), (_(u'Enter your Broadcast address:'), 15), (_(u'Enter your Netmask:'),15,'255.255.255.0'))) - (ip_address, broadcast, netmask) = data[:-1].split('\n') if code != self._DLG_OK: continue + (ip_address, broadcast, netmask) = data[:-1].split('\n') #Set the info now that it's all gathered. interfaces[newnic] = (ip_address, broadcast, netmask) else: #they have chosen an interface, present them with edit/delete @@ -1308,9 +1308,9 @@ Press OK to continue""") ((_(u'Enter your IP address:'), 15, interfaces[iface_choice][0]), (_(u'Enter your Broadcast address:'), 15, interfaces[iface_choice][1]), (_(u'Enter your Netmask:'),15,interfaces[iface_choice][2]))) - (ip_address, broadcast, netmask) = data[:-1].split('\n') if code != self._DLG_OK: continue + (ip_address, broadcast, netmask) = data[:-1].split('\n') #Set the info now that it's all gathered. interfaces[iface_choice] = (ip_address, broadcast, netmask) else: |