From 633f70e93eefd2c7da899d40925ecadde16a0fb3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 5 Sep 2017 03:36:03 -0400 Subject: [PATCH] Be more explicit on why a device is winnowed from the list --- src/modules/partition/core/DeviceList.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index 055c18dbc..05616335b 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -137,12 +137,14 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize ) it = erase(devices, it ); } - else if ( writableOnly && ( - hasRootPartition( *it ) || - isIso9660( *it ) ) - ) + else if ( writableOnly && hasRootPartition( *it ) ) { - cDebug() << " .. Removing root-or-CD" << it; + cDebug() << " .. Removing device with root filesystem (/) on it" << it; + it = erase(devices, it ); + } + else if ( writableOnly && isIso9660( *it ) ) + { + cDebug() << " .. Removing device with iso9660 filesystem (probably a CD) on it" << it; it = erase(devices, it ); } else if ( (minimumSize >= 0) && !( (*it)->capacity() > minimumSize ) )