From 68a08eb49b6666d355055537d62653581a87bb80 Mon Sep 17 00:00:00 2001 From: David Lehman Date: Fri, 15 May 2009 14:26:00 -0500 Subject: Don't schedule a format resize if reformat scheduled. (#500991) --- iw/lvm_dialog_gui.py | 3 ++- iw/partition_dialog_gui.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py index 5102588e7..733b77602 100644 --- a/iw/lvm_dialog_gui.py +++ b/iw/lvm_dialog_gui.py @@ -1078,7 +1078,8 @@ class VolumeGroupEditor: # check the lv's format also, explicitly, in case it is # encrypted. in this case we must check them both. if format.resizable and lv.format.resizable and \ - lv.targetSize != format.currentSize: + lv.targetSize != format.currentSize and \ + usedev.format.exists: new_size = lv.targetSize actions.append(ActionResizeFormat(usedev, new_size)) elif lv.format.type: diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py index 8a098a42c..45748c2ee 100644 --- a/iw/partition_dialog_gui.py +++ b/iw/partition_dialog_gui.py @@ -291,7 +291,7 @@ class PartitionEditor: try: actions.append(ActionResizeDevice(request, size)) - if request.format.type: + if request.format.type and request.format.exists: actions.append(ActionResizeFormat(request, size)) except ValueError: pass -- cgit