applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-26 08:58:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make logging more consistent.

Browse source 
- Across all the C++ modules, use Logger::SubEntry for sub/continues
   log lines, instead of somewhat-random indent strings.
This commit is contained in:
Adriaan de Groot 2019-04-15 08:59:12 -04:00
parent d6cf0617f6
commit 520478847c
12 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/partition/core/PartUtils.cpp
View file

@ -236,7 +236,7 @@ lookForFstabEntries( const QString& partitionPath )
{
QFile fstabFile( mountsDir.path() + "/etc/fstab" );
cDebug() << " .. reading" << fstabFile.fileName();
cDebug() << Logger::SubEntry << "reading" << fstabFile.fileName();
if ( fstabFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
{
@ -246,9 +246,9 @@ lookForFstabEntries( const QString& partitionPath )
for ( const QString& rawLine : fstabLines )
fstabEntries.append( FstabEntry::fromEtcFstab( rawLine ) );
fstabFile.close();
cDebug() << " .. got" << fstabEntries.count() << "lines.";
cDebug() << Logger::SubEntry << "got" << fstabEntries.count() << "lines.";
std::remove_if( fstabEntries.begin(), fstabEntries.end(), [](const FstabEntry& x) { return !x.isValid(); } );
cDebug() << " .. got" << fstabEntries.count() << "fstab entries.";
cDebug() << Logger::SubEntry << "got" << fstabEntries.count() << "fstab entries.";
}
else
cWarning() << "Could not read fstab from mounted fs";
@ -408,7 +408,7 @@ bool
isEfiBootable( const Partition* candidate )
{
cDebug() << "Check EFI bootable" << convenienceName( candidate ) << candidate->devicePath();
cDebug() << " .. flags" << candidate->activeFlags();
cDebug() << Logger::SubEntry << "flags" << candidate->activeFlags();
auto flags = PartitionInfo::flags( candidate );
@ -421,7 +421,7 @@ isEfiBootable( const Partition* candidate )
while ( root && !root->isRoot() )
{
root = root->parent();
cDebug() << " .. moved towards root" << (void *)root;
cDebug() << Logger::SubEntry << "moved towards root" << (void *)root;
}
// Strange case: no root found, no partition table node?
@ -429,7 +429,7 @@ isEfiBootable( const Partition* candidate )
return false;
const PartitionTable* table = dynamic_cast<const PartitionTable*>( root );
cDebug() << " .. partition table" << (void *)table << "type" << ( table ? table->type() : PartitionTable::TableType::unknownTableType );
cDebug() << Logger::SubEntry << "partition table" << (void *)table << "type" << ( table ? table->type() : PartitionTable::TableType::unknownTableType );
return table && ( table->type() == PartitionTable::TableType::gpt ) &&
flags.testFlag( KPM_PARTITION_FLAG(Boot) );
}