summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Fulbright <msf@redhat.com>2001-07-06 22:15:37 +0000
committerMike Fulbright <msf@redhat.com>2001-07-06 22:15:37 +0000
commit5df58f0a513ecafeac3d915e3521f79de236d2d7 (patch)
tree09dbf13c33e3332b86a18691ef4706887955e6e1
parent62e2a9a28d21d793225bb840a9476ac38f63abc9 (diff)
downloadanaconda-5df58f0a513ecafeac3d915e3521f79de236d2d7.tar.gz
anaconda-5df58f0a513ecafeac3d915e3521f79de236d2d7.tar.xz
anaconda-5df58f0a513ecafeac3d915e3521f79de236d2d7.zip
fix deleting raid devices
-rw-r--r--partitioning.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/partitioning.py b/partitioning.py
index 888a5505a..e15147a6d 100644
--- a/partitioning.py
+++ b/partitioning.py
@@ -1035,7 +1035,11 @@ def getAutopartitionBoot():
def confirmDeleteRequest(intf, request):
if request.device:
- errmsg = _("You are about to delete the /dev/%s partition.\n\nAre you sure?" % request.device)
+ if request.type == REQUEST_RAID:
+ errmsg = _("You are about to delete a RAID device.\n\nAre you sure?" % request.device)
+ else:
+ errmsg = _("You are about to delete the /dev/%s partition.\n\nAre you sure?" % request.device)
+
else:
errmsg = _("Are you sure you want to delete this partition?")
@@ -1066,9 +1070,9 @@ def doDeletePartitionByRequest(intf, requestlist, partition):
return 0
else:
device = get_partition_name(partition)
-
+
# see if device is in our partition requests, remove
- request = requestlist.getRequestByDeviceName(get_partition_name(partition))
+ request = requestlist.getRequestByDeviceName(device)
if request:
if request.type == REQUEST_PROTECTED:
intf.messageWindow(_("Unable To Remove"),