[PATCH 5/6] Show the correct device path when formatting as swap or luks.

[David Lehman <dlehman@xxxxxxxxxx>]

---
 storage/formats/luks.py |    3 ++-
 storage/formats/swap.py |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/storage/formats/luks.py b/storage/formats/luks.py
index ea3e3d2..b164f14 100644
--- a/storage/formats/luks.py
+++ b/storage/formats/luks.py
@@ -192,7 +192,8 @@ class LUKS(DeviceFormat):
         w = None
         if intf:
             w = intf.waitWindow(_("Formatting"),
-                                _("Encrypting %s") % (self.device,))
+                                _("Encrypting %s") % kwargs.get("device",
+                                                                self.device))
 
         try:
             DeviceFormat.create(self, *args, **kwargs)
diff --git a/storage/formats/swap.py b/storage/formats/swap.py
index f7538c2..362f6d5 100644
--- a/storage/formats/swap.py
+++ b/storage/formats/swap.py
@@ -160,7 +160,8 @@ class SwapSpace(DeviceFormat):
         if intf:
             w = intf.progressWindow(_("Formatting"),
                                     _("Creating %s on %s")
-                                    % (self.type, self.device),
+                                    % (self.type,
+                                       kwargs.get("device", self.device)),
                                     100, pulse = True)
 
         try:
-- 
1.6.6

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