| 1 |
Author: codeman |
| 2 |
Date: 2008-05-04 23:10:44 +0000 (Sun, 04 May 2008) |
| 3 |
New Revision: 1898 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/src/fe/dialog/gli-dialog.py |
| 7 |
Log: |
| 8 |
fixing bug 220275 by moving the cancel check |
| 9 |
up before trying to assign the variables. |
| 10 |
|
| 11 |
|
| 12 |
Modified: trunk/src/fe/dialog/gli-dialog.py |
| 13 |
=================================================================== |
| 14 |
--- trunk/src/fe/dialog/gli-dialog.py 2008-04-17 17:04:54 UTC (rev 1897) |
| 15 |
+++ trunk/src/fe/dialog/gli-dialog.py 2008-05-04 23:10:44 UTC (rev 1898) |
| 16 |
@@ -185,9 +185,9 @@ |
| 17 |
(_(u'Enter a FTP Proxy IP:'), 15), |
| 18 |
(_(u'Enter a RSYNC Proxy:'),15) |
| 19 |
)) |
| 20 |
- (ip_address, broadcast, netmask, gateway, dnsservers, http_proxy, ftp_proxy, rsync_proxy) = data[:-1].split('\n') |
| 21 |
if code != self._DLG_OK: |
| 22 |
return |
| 23 |
+ (ip_address, broadcast, netmask, gateway, dnsservers, http_proxy, ftp_proxy, rsync_proxy) = data[:-1].split('\n') |
| 24 |
|
| 25 |
if ftp_proxy and ftp_proxy != "": |
| 26 |
os.environ['ftp_proxy'] = ftp_proxy |
| 27 |
@@ -1283,9 +1283,9 @@ |
| 28 |
((_(u'Enter your IP address:'), 15), |
| 29 |
(_(u'Enter your Broadcast address:'), 15), |
| 30 |
(_(u'Enter your Netmask:'),15,'255.255.255.0'))) |
| 31 |
- (ip_address, broadcast, netmask) = data[:-1].split('\n') |
| 32 |
if code != self._DLG_OK: |
| 33 |
continue |
| 34 |
+ (ip_address, broadcast, netmask) = data[:-1].split('\n') |
| 35 |
#Set the info now that it's all gathered. |
| 36 |
interfaces[newnic] = (ip_address, broadcast, netmask) |
| 37 |
else: #they have chosen an interface, present them with edit/delete |
| 38 |
@@ -1308,9 +1308,9 @@ |
| 39 |
((_(u'Enter your IP address:'), 15, interfaces[iface_choice][0]), |
| 40 |
(_(u'Enter your Broadcast address:'), 15, interfaces[iface_choice][1]), |
| 41 |
(_(u'Enter your Netmask:'),15,interfaces[iface_choice][2]))) |
| 42 |
- (ip_address, broadcast, netmask) = data[:-1].split('\n') |
| 43 |
if code != self._DLG_OK: |
| 44 |
continue |
| 45 |
+ (ip_address, broadcast, netmask) = data[:-1].split('\n') |
| 46 |
#Set the info now that it's all gathered. |
| 47 |
interfaces[iface_choice] = (ip_address, broadcast, netmask) |
| 48 |
else: |
| 49 |
|
| 50 |
-- |
| 51 |
gentoo-commits@l.g.o mailing list |
Archives