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

[partition] Improve formatting of logging while loading configuration

Browse Source
This commit is contained in:
Adriaan de Groot 2021-03-29 14:41:56 +02:00
parent 0446f03613
commit 785042ccf3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/partition/gui/PartitionViewStep.cpp
View File

@ -518,6 +518,8 @@ PartitionViewStep::onLeave()
void void
PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{ {
Logger::Once o;
m_config->setConfigurationMap( configurationMap ); m_config->setConfigurationMap( configurationMap );
// Copy the efiSystemPartition setting to the global storage. It is needed not only in // Copy the efiSystemPartition setting to the global storage. It is needed not only in
@ -528,7 +530,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
// Set up firmwareType global storage entry. This is used, e.g. by the bootloader module. // Set up firmwareType global storage entry. This is used, e.g. by the bootloader module.
QString firmwareType( PartUtils::isEfiSystem() ? QStringLiteral( "efi" ) : QStringLiteral( "bios" ) ); QString firmwareType( PartUtils::isEfiSystem() ? QStringLiteral( "efi" ) : QStringLiteral( "bios" ) );
cDebug() << "Setting firmwareType to" << firmwareType; cDebug() << o << "Setting firmwareType to" << firmwareType;
gs->insert( "firmwareType", firmwareType ); gs->insert( "firmwareType", firmwareType );
// Read and parse key efiSystemPartitionSize // Read and parse key efiSystemPartitionSize
@ -568,7 +570,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
QString fsRealName = PartUtils::findFS( fsName, &fsType ); QString fsRealName = PartUtils::findFS( fsName, &fsType );
if ( fsRealName == fsName ) if ( fsRealName == fsName )
{ {
cDebug() << "Partition-module setting *defaultFileSystemType*" << fsRealName; cDebug() << o << "Partition-module setting *defaultFileSystemType*" << fsRealName;
} }
else if ( fsType != FileSystem::Unknown ) else if ( fsType != FileSystem::Unknown )
{ {