From 35a2db064b1839fa949a7666c73ae172739fcf1b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 20 Feb 2020 11:59:48 +0100 Subject: [PATCH] [partition] Make debug-logging match the functionality - `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. --- src/modules/partition/jobs/FillGlobalStorageJob.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index f779434a1..c96687b82 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -214,6 +214,7 @@ FillGlobalStorageJob::exec() { Calamares::GlobalStorage* storage = Calamares::JobQueue::instance()->globalStorage(); storage->insert( "partitions", createPartitionList() ); + cDebug() << "Saving partition information map to GlobalStorage[\"partitions\"]"; if ( !m_bootLoaderPath.isEmpty() ) { QVariant var = createBootLoaderMap(); @@ -237,7 +238,7 @@ FillGlobalStorageJob::createPartitionList() const { UuidForPartitionHash hash = findPartitionUuids( m_devices ); QVariantList lst; - cDebug() << "Writing to GlobalStorage[\"partitions\"]"; + cDebug() << "Building partition information map"; for ( auto device : m_devices ) { cDebug() << Logger::SubEntry << "partitions on" << device->deviceNode();