napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always delete logical partitions first when deleting an extended partition

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-07-17 15:01:45 +02:00
parent d7a853ee06
commit 0d915b4995
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/partition/PartitionCoreModule.cpp
View File

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