[PATCH 4/5] Never pass "<Not applicable>" as mountpoint to format constructors.

[David Lehman <dlehman@xxxxxxxxxx>]

---
 iw/lvm_dialog_gui.py       |    2 ++
 iw/partition_dialog_gui.py |    3 +++
 iw/raid_dialog_gui.py      |    3 +++
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py
index 6ea54ab..bae72f5 100644
--- a/iw/lvm_dialog_gui.py
+++ b/iw/lvm_dialog_gui.py
@@ -593,6 +593,8 @@ class VolumeGroupEditor:
                 fmt_class = self.fsoptionsDict["fstypeCombo"].get_active_value()
 
             mountpoint = mountCombo.get_children()[0].get_text().strip()
+            if mountpoint == _("<Not Applicable>"):
+                mountpoint = ""
 
             # validate logical volume name
             lvname = lvnameentry.get_text().strip()
diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py
index b621087..fc93d66 100644
--- a/iw/partition_dialog_gui.py
+++ b/iw/partition_dialog_gui.py
@@ -110,6 +110,9 @@ class PartitionEditor:
                 return []
 
             mountpoint = self.mountCombo.get_children()[0].get_text()
+            if mountpoint == _("<Not Applicable>"):
+                mountpoint = ""
+
             if mountpoint:
                 used = False
                 for (mp, dev) in self.storage.mountpoints.iteritems():
diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py
index 8e31767..eca96ba 100644
--- a/iw/raid_dialog_gui.py
+++ b/iw/raid_dialog_gui.py
@@ -166,6 +166,9 @@ class RaidEditor:
                 continue
 
             mountpoint = self.mountCombo.get_children()[0].get_text()
+            if mountpoint == _("<Not Applicable>"):
+                mountpoint = ""
+
             if mountpoint:
                 used = False
                 for (mp, dev) in self.storage.mountpoints.iteritems():
-- 
1.6.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list