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

[partition] Use structured logging

Browse source
This commit is contained in:
Adriaan de Groot 2019-04-04 17:13:57 +02:00
parent 14bedef411
commit b5a997d11e
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,7 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize )
#ifdef DEBUG_PARTITION_UNSAFE #ifdef DEBUG_PARTITION_UNSAFE
cWarning() << "Allowing unsafe partitioning choices." << devices.count() << "candidates."; cWarning() << "Allowing unsafe partitioning choices." << devices.count() << "candidates.";
#ifdef DEBUG_PARTITION_LAME #ifdef DEBUG_PARTITION_LAME
cDebug() << ".. it has been lamed, and will fail."; cDebug() << Logger::SubEntry() << "it has been lamed, and will fail.";
#endif #endif
#else #else
cDebug() << "Removing unsuitable devices:" << devices.count() << "candidates."; cDebug() << "Removing unsuitable devices:" << devices.count() << "candidates.";
@ -125,29 +125,29 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize )
for ( DeviceList::iterator it = devices.begin(); it != devices.end(); ) for ( DeviceList::iterator it = devices.begin(); it != devices.end(); )
if ( !( *it ) ) if ( !( *it ) )
{ {
cDebug() << " .. Skipping nullptr device"; cDebug() << Logger::SubEntry() << "Skipping nullptr device";
it = erase( devices, it); it = erase( devices, it);
} }
else if ( ( *it )->deviceNode().startsWith( "/dev/zram" ) else if ( ( *it )->deviceNode().startsWith( "/dev/zram" )
) )
{ {
cDebug() << " .. Removing zram" << it; cDebug() << Logger::SubEntry() << "Removing zram" << it;
it = erase( devices, it ); it = erase( devices, it );
} }
else if ( writableOnly && hasRootPartition( *it ) ) else if ( writableOnly && hasRootPartition( *it ) )
{ {
cDebug() << " .. Removing device with root filesystem (/) on it" << it; cDebug() << Logger::SubEntry() << "Removing device with root filesystem (/) on it" << it;
it = erase( devices, it ); it = erase( devices, it );
} }
else if ( writableOnly && isIso9660( *it ) ) else if ( writableOnly && isIso9660( *it ) )
{ {
cDebug() << " .. Removing device with iso9660 filesystem (probably a CD) on it" << it; cDebug() << Logger::SubEntry() << "Removing device with iso9660 filesystem (probably a CD) on it" << it;
it = erase( devices, it ); it = erase( devices, it );
} }
else if ( (minimumSize >= 0) && !( (*it)->capacity() > minimumSize ) ) else if ( (minimumSize >= 0) && !( (*it)->capacity() > minimumSize ) )
{ {
cDebug() << " .. Removing too-small" << it; cDebug() << Logger::SubEntry() << "Removing too-small" << it;
it = erase( devices, it ); it = erase( devices, it );
} }
else else