[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

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



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ack.

On Mon, 15 Feb 2010, David Lehman wrote:

---
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:


- -- David Cantrell <dcantrell redhat com>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkt6yScACgkQ5hsjjIy1VknD7gCgiRtG5XieoBe5iBNyd6myUjRk
sXgAn0kC3dMmrZhMgavCP8o7y6ZL7bLE
=n6DR
-----END PGP SIGNATURE-----


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]