These should all be non-controversial. I'ld like to clear them, especially patch (2) which fixes a previous.
mulhern (3): Fix stray comment. Quit if no device type name selected. Unconditionally change device to raw_device.
pyanaconda/ui/gui/spokes/custom.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
--- pyanaconda/ui/gui/spokes/custom.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 9fdfbc2..422a9f4 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -1117,9 +1117,10 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): changed_container or changed_container_encrypted or changed_container_raid_level or changed_container_size)
- ## - ## Handle changes to an existing device - ## + # If something has changed but the device does not exist, + # there is no need to schedule actions on the device. + # It is only necessary to create a new device object + # which reflects the current choices. if not use_dev.exists: if not changed: log.debug("nothing changed for new device")
Belongs with commit acfd5b4195d9e0a3f4e287757712c9d5bf26afa6.
Signed-off-by: mulhern amulhern@redhat.com --- pyanaconda/ui/gui/spokes/custom.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 422a9f4..26a4915 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -2525,9 +2525,14 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): new_type = self._get_current_device_type_name() log.debug("device_type_changed: %s", new_type)
- # But the numeric id of the device is what is needed by blivet + # Quit if no device type is selected. + if new_type is None: + return + + # The numeric id of the device is what is needed by blivet. new_type = dev_type_from_const(new_type)
+ # Quit if device type name is unrecognized by blivet. if new_type is None: return
How the method obtained the device can't affect which device it ought to work with.
Signed-off-by: mulhern amulhern@redhat.com --- pyanaconda/ui/gui/spokes/custom.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 26a4915..3273e1d 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -2397,8 +2397,9 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): return
device = self._current_selector.device - if device: - device = device.raw_device + + if device: + device = device.raw_device
container_size_policy = SIZE_POLICY_AUTO if device_type not in CONTAINER_DEVICE_TYPES:
On Thu, Oct 16, 2014 at 11:57:51AM -0400, mulhern wrote:
These should all be non-controversial. I'ld like to clear them, especially patch (2) which fixes a previous.
mulhern (3): Fix stray comment. Quit if no device type name selected. Unconditionally change device to raw_device.
pyanaconda/ui/gui/spokes/custom.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
-- 1.9.3
Ack
anaconda-patches@lists.fedorahosted.org