[PATCH 08/15] remove Network(): device description attribute of NetworkDevice
Radek Vykydal
rvykydal at redhat.com
Thu Jul 19 10:02:41 UTC 2012
---
pyanaconda/iw/network_gui.py | 2 +-
pyanaconda/network.py | 4 ----
2 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/pyanaconda/iw/network_gui.py b/pyanaconda/iw/network_gui.py
index 8df2038..bdf2ee8 100644
--- a/pyanaconda/iw/network_gui.py
+++ b/pyanaconda/iw/network_gui.py
@@ -162,7 +162,7 @@ def selectInstallNetDeviceDialog(network, devices = None):
if not preselected:
preselected = i
- desc = network.netdevices[dev].description
+ desc = isys.getNetDevDesc(dev)
if desc:
desc = "%s - %s" %(dev, desc)
else:
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index 65ef239..2d55b67 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -205,7 +205,6 @@ class NetworkDevice(IfcfgFile):
def __init__(self, dir, iface):
IfcfgFile.__init__(self, dir, iface)
- self.description = ""
if iface.startswith('ctc'):
self.info["TYPE"] = "CTC"
self.wepkey = ""
@@ -391,7 +390,6 @@ class WirelessNetworkDevice(NetworkDevice):
self.info = dict()
self.iface = iface
self.dir = ""
- self.description = ""
def clear(self):
self.info = dict()
@@ -450,8 +448,6 @@ class Network:
else:
device.setDefaultConfig()
- device.description = isys.getNetDevDesc(iface)
-
self.netdevices[iface] = device
@property
--
1.7.4
More information about the anaconda-patches
mailing list