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

[partition] In logging, distinguish more cases

Browse Source 
- While winnowing devices, the zram and nullptr cases
   were mixed together; split them, for the sake of
   logging more accurately.
 - While here, fix up some coding-style issues.
This commit is contained in:
Adriaan de Groot 2018-10-03 13:46:08 +02:00
parent d507425128
commit 800f9d34f9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,8 +113,12 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize )
// 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(); )
if ( ! ( *it ) || if ( !( *it ) )
( *it )->deviceNode().startsWith( "/dev/zram" ) {
cDebug() << " .. Skipping nullptr device";
it = erase( devices, it);
}
else if ( ( *it )->deviceNode().startsWith( "/dev/zram" )
) )
{ {
cDebug() << " .. Removing zram" << it; cDebug() << " .. Removing zram" << it;