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

[partition] Make debug-logging match the functionality

Browse Source 
- `createPartitionList()` is called for the summary widget (via
  `prettyDescription()`), and from `exec()`. Only the latter
  actually *writes* to Global Storage, so it's misleading to
  think that the pretty-printed version ends up in GS.
- This makes the "new" key useless, since by the time `exec()` is called
  the partitoons are no longer new.
This commit is contained in:
Adriaan de Groot 2020-02-20 11:59:48 +01:00
parent f9d9cd2df4
commit 35a2db064b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/partition/jobs/FillGlobalStorageJob.cpp
View File

@ -214,6 +214,7 @@ FillGlobalStorageJob::exec()
{ {
Calamares::GlobalStorage* storage = Calamares::JobQueue::instance()->globalStorage(); Calamares::GlobalStorage* storage = Calamares::JobQueue::instance()->globalStorage();
storage->insert( "partitions", createPartitionList() ); storage->insert( "partitions", createPartitionList() );
cDebug() << "Saving partition information map to GlobalStorage[\"partitions\"]";
if ( !m_bootLoaderPath.isEmpty() ) if ( !m_bootLoaderPath.isEmpty() )
{ {
QVariant var = createBootLoaderMap(); QVariant var = createBootLoaderMap();
@ -237,7 +238,7 @@ FillGlobalStorageJob::createPartitionList() const
{ {
UuidForPartitionHash hash = findPartitionUuids( m_devices ); UuidForPartitionHash hash = findPartitionUuids( m_devices );
QVariantList lst; QVariantList lst;
cDebug() << "Writing to GlobalStorage[\"partitions\"]"; cDebug() << "Building partition information map";
for ( auto device : m_devices ) for ( auto device : m_devices )
{ {
cDebug() << Logger::SubEntry << "partitions on" << device->deviceNode(); cDebug() << Logger::SubEntry << "partitions on" << device->deviceNode();