Fix bad patch reordering (#473803)
Ack.
On 05/14/2010 12:21 PM, Radek Vykydal wrote:
This bit got lost when I was separating wireless support
from nm-c-e patches which results in traceback.
---
network.py | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/network.py b/network.py
index 59cae9a..7d7016c 100644
--- a/network.py
+++ b/network.py
@@ -286,12 +286,17 @@ class NetworkDevice(IfcfgFile):
IfcfgFile.set(self, *args)
self._dirty = True
+ @property
+ def keyfilePath(self):
+ return os.path.join(self.dir, "keys-%s" % self.iface)
+
def writeWepkeyFile(self, dir=None, overwrite=True):
if not self.wepkey:
return False
if not dir:
- dir = os.path.dirname(self.path)
- keyfile = os.path.join(dir, "keys-%s" % self.iface)
+ keyfile = self.keyfilePath
+ else:
+ keyfile = os.path.join(dir, os.path.basename(self.keyfilePath))
if not overwrite and os.path.isfile(keyfile):
return False
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
|
