For rhel7-branch I will roll this in with the following commit:
a01d78fc Handle cancelation of device resize in the ... (#1027947)
Cancelling the resize actions in the order they were scheduled meant that the target size would end up being the size just prior to scheduling the last resize action -- not the initial size. This only matters if the user tries multiple sizes before resetting to the original size. --- pyanaconda/ui/gui/spokes/custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index ac6cab6..03463b7 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -1472,7 +1472,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): actions = self.__storage.devicetree.findActions(type="resize", devid=device.id) with ui_storage_logger(): - for action in actions: + for action in reversed(actions): self.__storage.devicetree.cancelAction(action) _changed_size = True elif size != device.size:
----- Original Message -----
From: "David Lehman" dlehman@redhat.com To: anaconda-patches@lists.fedorahosted.org Sent: Friday, December 13, 2013 2:37:36 PM Subject: [PATCH] Fix reset of existing device to its original size.
Cancelling the resize actions in the order they were scheduled meant that the target size would end up being the size just prior to scheduling the last resize action -- not the initial size. This only matters if the user tries multiple sizes before resetting to the original size.
pyanaconda/ui/gui/spokes/custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index ac6cab6..03463b7 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -1472,7 +1472,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): actions = self.__storage.devicetree.findActions(type="resize", devid=device.id) with ui_storage_logger():
for action in actions:
for action in reversed(actions): self.__storage.devicetree.cancelAction(action) _changed_size = True elif size != device.size:
-- 1.8.1.4
Ack.
anaconda-patches mailing list anaconda-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches
anaconda-patches@lists.fedorahosted.org