Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make resize_move_partition() skip whole disk device partitions (#775932) 

Make the logic at the resize_move_partition() call sites a little
simpler by not having to avoid calling it for whole disk device
partitions.  Make it a successful non-operation in that case.

Bug 775932 - Refactor mostly applying of operations
This commit is contained in:
Mike Fleetwood 2016-11-14 20:26:29 +00:00 committed by Curtis Gedak
parent 84acec3f91
commit 7caebd2515
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/GParted_Core.cc
View File

@ -2508,8 +2508,7 @@ bool GParted_Core::resize( const Partition & partition_old,
if ( partition_new.filesystem == FS_LINUX_SWAP ) if ( partition_new.filesystem == FS_LINUX_SWAP )
{ {
// linux-swap is recreated, not resize // linux-swap is recreated, not resize
success = ( partition_new.whole_device || success = resize_move_partition( partition_old, partition_new, operationdetail )
resize_move_partition( partition_old, partition_new, operationdetail ) )
&& resize_filesystem( partition_old, partition_new, operationdetail ); && resize_filesystem( partition_old, partition_new, operationdetail );
return success; return success;
@ -2520,14 +2519,12 @@ bool GParted_Core::resize( const Partition & partition_old,
{ {
success = check_repair_filesystem( partition_new, operationdetail ) success = check_repair_filesystem( partition_new, operationdetail )
&& resize_filesystem( partition_old, partition_new, operationdetail ) && resize_filesystem( partition_old, partition_new, operationdetail )
&& ( partition_new.whole_device || && resize_move_partition( partition_old, partition_new, operationdetail );
resize_move_partition( partition_old, partition_new, operationdetail ) );
} }
else if ( delta > 0LL ) // grow else if ( delta > 0LL ) // grow
{ {
success = check_repair_filesystem( partition_new, operationdetail ) success = check_repair_filesystem( partition_new, operationdetail )
&& ( partition_new.whole_device || && resize_move_partition( partition_old, partition_new, operationdetail )
resize_move_partition( partition_old, partition_new, operationdetail ) )
&& maximize_filesystem( partition_new, operationdetail ); && maximize_filesystem( partition_new, operationdetail );
} }
@ -2538,6 +2535,11 @@ bool GParted_Core::resize_move_partition( const Partition & partition_old,
const Partition & partition_new, const Partition & partition_new,
OperationDetail & operationdetail ) OperationDetail & operationdetail )
{ {
if ( partition_new.whole_device )
// Trying to resize/move a non-partitioned whole disk device is a
// successful non-operation.
return true;
//i'm not too happy with this, but i think it is the correct way from a i18n POV //i'm not too happy with this, but i think it is the correct way from a i18n POV
enum Action enum Action
{ {