more informative messages

1 files changed, 11 insertions, 6 deletions

diff --git a/raid.py b/raid.py
index 36123c3e3..7603ca65e 100644
--- a/raid.py
+++ b/raid.py
@@ -34,9 +34,10 @@ def scanForRaid(drives):
 			raidSets[raidSet]
 		if knownLevel != level or knownDisks != totalDisks or \
 		   knownMinor != mdMinor:
-		       # Raise hell
-		    raise SystemError, "raid set inconsistency for md%d" % \
-				(mdMinor)
+                    # Raise hell
+		    raise SystemError, ("raid set inconsistency for md%d: "
+                                        "all drives in this raid set do not "
+                                        "agree on raid parameters" % (mdMinor,))
 		knownDevices.append(dev)
 		raidSets[raidSet] = (knownLevel, knownDisks, knownMinor,
 				     knownDevices)
@@ -45,8 +46,10 @@ def scanForRaid(drives):
 
 	    if raidDevices.has_key(mdMinor):
 	    	if (raidDevices[mdMinor] != raidSet):
-		    raise SystemError, "raid set inconsistency for md%d" % \
-				(mdMinor)
+		    raise SystemError, ("raid set inconsistency for md%d: "
+                                        "found members of multiple raid sets "
+                                        "that claim to be md%d"
+                                        % (mdMinor, mdMinor))
 	    else:
 	    	raidDevices[mdMinor] = raidSet
 
@@ -54,7 +57,9 @@ def scanForRaid(drives):
     for key in raidSets.keys():
 	(level, totalDisks, mdMinor, devices) = raidSets[key]
 	if len(devices) < totalDisks:
-	    str = "missing components of raid device md%d" % (mdMinor,)
+	    str = ("missing components of raid device md%d.  The "
+                   "raid device needs %d drives and only %d were found."
+                   % (mdMinor, len(devices), totalDisks))
 	    raise SystemError, str
 	raidList.append((mdMinor, devices))