---
iw/partition_gui.py | 2 +-
partIntfHelpers.py | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/iw/partition_gui.py b/iw/partition_gui.py
index d239cd3..f3f0ff9 100644
--- a/iw/partition_gui.py
+++ b/iw/partition_gui.py
@@ -874,7 +874,7 @@ class PartitionWindow(InstallWindow):
formatWarnings = getPreExistFormatWarnings(self.storage)
if formatWarnings:
- labelstr1 = _("The following pre-existing partitions have been "
+ labelstr1 = _("The following pre-existing devices have been "
"selected to be formatted, destroying all data.")
# labelstr2 = _("Select 'Yes' to continue and format these "
diff --git a/partIntfHelpers.py b/partIntfHelpers.py
index 08c7ce9..95af9fc 100644
--- a/partIntfHelpers.py
+++ b/partIntfHelpers.py
@@ -304,14 +304,15 @@ def getPreExistFormatWarnings(storage):
"""Return a list of preexisting devices being formatted."""
devices = []
for device in storage.devicetree.devices:
- if device.exists and not device.format.exists:
+ if device.exists and not device.format.exists and \
+ not device.format.hidden:
devices.append(device)
devices.sort(key=lambda d: d.name)
rc = []
for device in devices:
rc.append((device.path,
- device.format.type,
+ device.format.name,
getattr(device.format, "mountpoint", "")))
return rc
--
1.6.5.2
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
