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

Forget pending changes when the partition table is recreated

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-07-11 17:08:56 +02:00
parent f0dffb7400
commit 7ac6588090
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,14 @@ PartitionCoreModule::DeviceInfo::hasRootMountPoint() const
return false;
}
void
PartitionCoreModule::DeviceInfo::forgetChanges()
{
jobs.clear();
qDeleteAll( m_partitionInfoHash );
m_partitionInfoHash.clear();
}
//- PartitionCoreModule ------------------------------------
PartitionCoreModule::PartitionCoreModule( QObject* parent )
: QObject( parent )
@ -128,13 +136,16 @@ PartitionCoreModule::partitionModelForDevice( Device* device ) const
void
PartitionCoreModule::createPartitionTable( Device* device )
{
DeviceInfo* info = infoForDevice( device );
// Creating a partition table wipes all the disk, so there is no need to
// keep previous changes
info->forgetChanges();
CreatePartitionTableJob* job = new CreatePartitionTableJob( device );
job->updatePreview();
refreshPartitionModel( device );
info->jobs << Calamares::job_ptr( job );
// FIXME: Remove all jobs queued for this device, as well as all partition
// info
infoForDevice( device )->jobs << Calamares::job_ptr( job );
refreshPartitionModel( device );
updateHasRootMountPoint();
}

2
src/modules/partition/PartitionCoreModule.h
View File

@ -92,6 +92,8 @@ private:
void removeInfoForPartition( Partition* partition );
bool hasRootMountPoint() const;
void forgetChanges();
private:
QHash< Partition*, PartitionInfo* > m_partitionInfoHash;
};