applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 09:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamares] [partition] Adjust to logging changes

Browse source 
- Use the un-paren'ed Continuation and SubEntry
This commit is contained in:
Adriaan de Groot 2019-04-15 08:15:17 -04:00
parent d72e3b3c22
commit 63b317902d
4 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -109,20 +109,20 @@ canBeResized( Partition* candidate )
if ( !candidate->fileSystem().supportGrow() ||
!candidate->fileSystem().supportShrink() )
{
cDebug() << Logger::SubEntry() << "NO, filesystem" << candidate->fileSystem().name()
cDebug() << Logger::SubEntry << "NO, filesystem" << candidate->fileSystem().name()
<< "does not support resize.";
return false;
}
if ( KPMHelpers::isPartitionFreeSpace( candidate ) )
{
cDebug() << Logger::SubEntry() << "NO, partition is free space";
cDebug() << Logger::SubEntry << "NO, partition is free space";
return false;
}
if ( candidate->isMounted() )
{
cDebug() << Logger::SubEntry() << "NO, partition is mounted";
cDebug() << Logger::SubEntry << "NO, partition is mounted";
return false;
}
@ -131,13 +131,13 @@ canBeResized( Partition* candidate )
PartitionTable* table = dynamic_cast< PartitionTable* >( candidate->parent() );
if ( !table )
{
cDebug() << Logger::SubEntry() << "NO, no partition table found";
cDebug() << Logger::SubEntry << "NO, no partition table found";
return false;
}
if ( table->numPrimaries() >= table->maxPrimaries() )
{
cDebug() << Logger::SubEntry() << "NO, partition table already has"
cDebug() << Logger::SubEntry << "NO, partition table already has"
<< table->maxPrimaries() << "primary partitions.";
return false;
}
@ -164,10 +164,10 @@ canBeResized( Partition* candidate )
else if ( ok )
{
auto deb = cDebug();
deb << Logger::SubEntry() << "NO, insufficient storage";
deb << Logger::Continuation() << "Required storage B:" << advisedStorageB
deb << Logger::SubEntry << "NO, insufficient storage";
deb << Logger::Continuation << "Required storage B:" << advisedStorageB
<< QString( "(%1GB)" ).arg( advisedStorageGB );
deb << Logger::Continuation() << "Available storage B:" << availableStorageB
deb << Logger::Continuation << "Available storage B:" << availableStorageB
<< QString( "(%1GB)" ).arg( availableStorageB / 1024 / 1024 / 1024 )
<< "for" << convenienceName( candidate ) << " length:" << candidate->length()
<< " sectorsUsed:" << candidate->sectorsUsed() << " fsType:" << candidate->fileSystem().name();
@ -175,7 +175,7 @@ canBeResized( Partition* candidate )
}
else
{
cDebug() << Logger::SubEntry() << "NO, requiredStorageGB is not set correctly.";
cDebug() << Logger::SubEntry << "NO, requiredStorageGB is not set correctly.";
return false;
}
}
@ -198,10 +198,10 @@ canBeResized( PartitionCoreModule* core, const QString& partitionPath )
return canBeResized( candidate );
}
}
cDebug() << Logger::SubEntry() << "no Partition* found for" << partitionWithOs;
cDebug() << Logger::SubEntry << "no Partition* found for" << partitionWithOs;
}
cDebug() << Logger::SubEntry() << "Partition" << partitionWithOs << "CANNOT BE RESIZED FOR AUTOINSTALL.";
cDebug() << Logger::SubEntry << "Partition" << partitionWithOs << "CANNOT BE RESIZED FOR AUTOINSTALL.";
return false;
}