diff options
author | Karsten Hopp <karsten@redhat.de> | 2004-06-16 19:02:03 +0000 |
---|---|---|
committer | Karsten Hopp <karsten@redhat.de> | 2004-06-16 19:02:03 +0000 |
commit | 85e33bb80c3a71d1e78b4c98bea8e984345c0852 (patch) | |
tree | ba837cb68c3ca6ffa9e2cc2a4088c1e534a35d94 /partedUtils.py | |
parent | e211050de1567c950cc6c01abe8d3cd3e5c0aad5 (diff) | |
download | anaconda-85e33bb80c3a71d1e78b4c98bea8e984345c0852.tar.gz anaconda-85e33bb80c3a71d1e78b4c98bea8e984345c0852.tar.xz anaconda-85e33bb80c3a71d1e78b4c98bea8e984345c0852.zip |
- add devicenumber to dialog to be more specific about which dasd is about to be formatted
Diffstat (limited to 'partedUtils.py')
-rw-r--r-- | partedUtils.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/partedUtils.py b/partedUtils.py index 6d2b7a147..0c1cd372c 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -803,8 +803,9 @@ class DiskSet: continue # FIXME: need the right fix for z/VM formatted dasd if iutil.getArch() == "s390" and isys.getDasdState(drive): + devs = isys.getDasdDevPort() rc = intf.messageWindow(_("Warning"), - _("The partition table on device %s was unreadable. " + _("The partition table on device %s (%s) was unreadable. " "To create new partitions it must be initialized, " "causing the loss of ALL DATA on this drive.\n\n" "This operation will override any previous " @@ -812,7 +813,7 @@ class DiskSet: "ignore.\n\n" "Would you like to initialize this drive, " "erasing ALL DATA?") - % (drive,), type = "yesno") + % (drive, devs[drive]), type = "yesno") if rc == 0: DiskSet.skippedDisks.append(drive) continue @@ -855,6 +856,11 @@ class DiskSet: DiskSet.skippedDisks.append(drive) continue else: + if iutil.getArch() == "s390": + devs = isys.getDasdDevPort() + format = drive + " (" + devs[drive] + ")" + else: + format = drive rc = intf.messageWindow(_("Warning"), _("The partition table on device %s was unreadable. " "To create new partitions it must be initialized, " @@ -864,7 +870,7 @@ class DiskSet: "ignore.\n\n" "Would you like to initialize this drive, " "erasing ALL DATA?") - % (drive,), type = "yesno") + % (format,), type = "yesno") if rc == 0: DiskSet.skippedDisks.append(drive) continue |