three small patches

[David Lehman]

I just opened bug 888560 for patch 3 and proposed it as a blocker.

[PATCH 1/3] Raise DeviceError instead of ValueError from device ctor. (#888089)

[David Lehman]

---
 pyanaconda/storage/devices.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py
index f4aabcd..e9fb54a 100644
--- a/pyanaconda/storage/devices.py
+++ b/pyanaconda/storage/devices.py
@@ -2669,7 +2669,7 @@ class MDRaidArrayDevice(StorageDevice):
                 len(parents) < mdraid.get_raid_min_members(self.level)):
             for dev in self.parents:
                 dev.removeChild()
-            raise ValueError, P_("A RAID%(raidLevel)d set requires at least %(minMembers)d member",
+            raise DeviceError, P_("A RAID%(raidLevel)d set requires at least %(minMembers)d member",
                                  "A RAID%(raidLevel)d set requires at least %(minMembers)d members",
                                  mdraid.get_raid_min_members(self.level)) % \
                                  {"raidLevel": self.level, "minMembers": mdraid.get_raid_min_members(self.level)}

[PATCH 2/3] Handle edit of preexisting encrypted lv. (#885378)

[David Lehman]

---
 pyanaconda/ui/gui/spokes/custom.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 27e628d..55b341d 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -1041,7 +1041,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         container = self.__storage.getContainer(factory)
         if not changed_device_type and device_type == DEVICE_TYPE_LVM:
             old_container = self.__storage.getContainer(factory,
-                                                        device=device)
+                                                        device=use_dev)
             container = self.__storage.getContainer(factory,
                                                     name=self._device_container_name)
             if self._device_container_name != old_container.name:

[PATCH 3/3] Always set passphrase for newly encrypted devices.

[David Lehman]

The previous check only set the passphrase if the device was new,
which doesn't cover the case of a newly encrypted preexisting device.
---
 pyanaconda/ui/gui/spokes/custom.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 55b341d..f2ab156 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -467,7 +467,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):

# make sure any device/passphrase pairs we've obtained are remebered
         for device in self.storage.devices:
-            if device.format.type == "luks" and not device.exists:
+            if device.format.type == "luks" and not device.format.exists:
                 if not device.format.hasKey:
                     device.format.passphrase = self.passphrase

[Chris Lumens]

> I just opened bug 888560 for patch 3 and proposed it as a blocker.

These all look fine.

- Chris