Revert to super-major behavior for volumes that aren't activated

either (#159079, #159182).

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5aab87dc7..1ec0fc491 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-31  Chris Lumens  <clumens@redhat.com>
+
+	* fsset.py (RAIDDevice.mdadmLine):  Revert to super-major behavior for
+	volumes that aren't activated either (#159079, #159182).
+
 2005-05-25  Chris Lumens  <clumens@redhat.com>
 
 	* iw/lvm_dialog_gui.py:  Use sizes of PV requests instead of
diff --git a/fsset.py b/fsset.py
index 4ef57fe3b..ed4b340ac 100644
--- a/fsset.py
+++ b/fsset.py
@@ -1936,7 +1936,11 @@ class RAIDDevice(Device):
         levels = ["multipath", "hsm", "translucent", "linear", "raid0",
                   "raid1", "", "", "raid5", "raid5"]
 
-        (dev, devices, level, numActive) = raid.lookup_raid_device (self.device)
+        # If we can't find the device for some reason, revert to old behavior.
+        try:
+            (dev, devices, level, numActive) = raid.lookup_raid_device (self.device)
+        except KeyError:
+            devices = []
 
         # First loop over all the devices that make up the RAID trying to read
         # the superblock off each.  If we read a superblock, return a line that