summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2006-08-01 19:10:13 +0000
committerPeter Jones <pjones@redhat.com>2006-08-01 19:10:13 +0000
commit9470395347fdf0a1b8d06e3400afca5b87a7fc3d (patch)
tree26f706c4bd0354647262a7c3d75afab5e4072dd0
parent878496fa44fcfcfc4226a97debf45bb120dcf5f7 (diff)
downloadanaconda-9470395347fdf0a1b8d06e3400afca5b87a7fc3d.tar.gz
anaconda-9470395347fdf0a1b8d06e3400afca5b87a7fc3d.tar.xz
anaconda-9470395347fdf0a1b8d06e3400afca5b87a7fc3d.zip
- fix keyname generation in drive cache removal
-rw-r--r--ChangeLog4
-rw-r--r--dmraid.py9
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f64e1a4e..d1082d52f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-01 Peter Jones <pjones@redhat.com>
+
+ * dmraid.py (DmDriveCache.remove): Fix key name generation
+
2006-08-01 David Cantrell <dcantrell@redhat.com>
* loader2/urls.c (addrToIp): Correctly handle IP addresses passed as
diff --git a/dmraid.py b/dmraid.py
index 6f186bdd2..63ee31abf 100644
--- a/dmraid.py
+++ b/dmraid.py
@@ -71,10 +71,11 @@ class DmDriveCache:
return self._addMapDevs(obj.name, members, obj)
def remove(self, name):
- if isys.cachedDrives.has_key(name):
- obj = isys.cachedDrives[name]
- log.debug("removing %s from isys cache" % (name,))
- del isys.cachedDrives[name]
+ objname = "mapper/" + name
+ if isys.cachedDrives.has_key(objname):
+ obj = isys.cachedDrives[objname]
+ log.debug("removing %s from isys cache" % (objname,))
+ del isys.cachedDrives[objname]
if self.cache.has_key(obj.name):
del self.cache[obj.name][obj.name]
for k,v in self.cache[obj.name].items():