|
|
|
@ -215,10 +215,6 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition )
|
|
|
|
|
auto deviceInfo = infoForDevice( device );
|
|
|
|
|
Q_ASSERT( deviceInfo );
|
|
|
|
|
|
|
|
|
|
QList< Calamares::job_ptr >& jobs = deviceInfo->jobs;
|
|
|
|
|
|
|
|
|
|
if ( partition->state() == Partition::StateNew )
|
|
|
|
|
{
|
|
|
|
|
if ( partition->roles().has( PartitionRole::Extended ) )
|
|
|
|
|
{
|
|
|
|
|
// Delete all logical partitions first
|
|
|
|
@ -232,6 +228,10 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition )
|
|
|
|
|
for ( auto partition : lst )
|
|
|
|
|
deletePartition( device, partition );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QList< Calamares::job_ptr >& jobs = deviceInfo->jobs;
|
|
|
|
|
if ( partition->state() == Partition::StateNew )
|
|
|
|
|
{
|
|
|
|
|
// Find matching CreatePartitionJob
|
|
|
|
|
auto it = std::find_if( jobs.begin(), jobs.end(), [ partition ]( Calamares::job_ptr job )
|
|
|
|
|
{
|
|
|
|
|