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

Partitions: improve wording of debug messages

Browse Source
This commit is contained in:
Adriaan de Groot 2017-07-12 04:57:22 -04:00 committed by Philip
parent aa35224ab1
commit 0cfca31cac
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/partition/core/DeviceList.cpp
View File

@ -58,9 +58,11 @@ isMounted( Device* device )
cDebug() << "Checking for mounted partitions in" << device->deviceNode(); cDebug() << "Checking for mounted partitions in" << device->deviceNode();
for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it ) for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it )
{ {
cDebug() << " .." << ( *it )->partitionPath() << "mount" << ( *it )->mountPoint();
if ( ! ( *it )->mountPoint().isEmpty() ) if ( ! ( *it )->mountPoint().isEmpty() )
{
cDebug() << " .." << ( *it )->partitionPath() << "is mounted on" << ( *it )->mountPoint();
return true; return true;
}
} }
return false; return false;
} }
@ -103,7 +105,7 @@ QList< Device* > getDevices( bool writableOnly )
CoreBackend* backend = CoreBackendManager::self()->backend(); CoreBackend* backend = CoreBackendManager::self()->backend();
DeviceList devices = backend->scanDevices( true ); DeviceList devices = backend->scanDevices( true );
cDebug() << "Winnowing" << devices.count() << "devices."; cDebug() << "Removing unsuitable devices:" << devices.count() << "candidates.";
// Remove the device which contains / from the list // Remove the device which contains / from the list
for ( DeviceList::iterator it = devices.begin(); it != devices.end(); ) for ( DeviceList::iterator it = devices.begin(); it != devices.end(); )
@ -111,7 +113,7 @@ QList< Device* > getDevices( bool writableOnly )
( *it )->deviceNode().startsWith( "/dev/zram" ) ( *it )->deviceNode().startsWith( "/dev/zram" )
) )
{ {
cDebug() << " .. Winnowing" << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) ); cDebug() << " .. Removing" << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) );
it = devices.erase( it ); it = devices.erase( it );
} }
@ -121,7 +123,7 @@ QList< Device* > getDevices( bool writableOnly )
isMounted( *it ) ) isMounted( *it ) )
) )
{ {
cDebug() << " .. Winnowing" << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) ); cDebug() << " .. Removing" << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) );
it = devices.erase( it ); it = devices.erase( it );
} }
else else