diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index 65c93014b..347dcb0a7 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -147,7 +147,7 @@ FillGlobalStorageJob::prettyDescription() const { QStringList lines; - const auto partitionList = createPartitionList().toList(); + const auto partitionList = createPartitionList(); for ( const QVariant& partitionItem : partitionList ) { if ( partitionItem.type() == QVariant::Map ) @@ -218,6 +218,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(); @@ -236,7 +237,7 @@ FillGlobalStorageJob::exec() return Calamares::JobResult::ok(); } -QVariant +QVariantList FillGlobalStorageJob::createPartitionList() const { UuidForPartitionHash hash = findPartitionUuids( m_devices ); diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.h b/src/modules/partition/jobs/FillGlobalStorageJob.h index c2bf80a06..e8a463815 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.h +++ b/src/modules/partition/jobs/FillGlobalStorageJob.h @@ -22,8 +22,8 @@ #include "Job.h" -// Qt #include +#include class Device; class Partition; @@ -48,7 +48,7 @@ private: QList< Device* > m_devices; QString m_bootLoaderPath; - QVariant createPartitionList() const; + QVariantList createPartitionList() const; QVariant createBootLoaderMap() const; };