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

Merge branch 'master' of https://github.com/calamares/calamares into development

Browse Source
This commit is contained in:
Philip 2017-06-14 18:40:40 +02:00
commit 21c2b15b8e
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/partition/CMakeLists.txt
View File

@ -11,6 +11,15 @@ find_package( KF5 REQUIRED CoreAddons )
find_package( KF5 REQUIRED Config I18n IconThemes KIO Service ) find_package( KF5 REQUIRED Config I18n IconThemes KIO Service )
find_package( KPMcore 3.0.3 REQUIRED ) find_package( KPMcore 3.0.3 REQUIRED )
find_library( atasmart_LIB atasmart )
find_library( blkid_LIB blkid )
if( NOT atasmart_LIB )
message( WARNING "atasmart library not found." )
endif()
if( NOT blkid_LIB )
message( WARNING "blkid library not found." )
endif()
add_subdirectory( tests ) add_subdirectory( tests )

3
src/modules/partition/core/PartitionCoreModule.cpp
View File

@ -157,7 +157,7 @@ PartitionCoreModule::doInit()
// Remove the device which contains / from the list // Remove the device which contains / from the list
for ( QList< Device* >::iterator it = devices.begin(); it != devices.end(); ) for ( QList< Device* >::iterator it = devices.begin(); it != devices.end(); )
if ( hasRootPartition( *it ) || if ( ! (*it) || hasRootPartition( *it ) ||
(*it)->deviceNode().startsWith( "/dev/zram") || (*it)->deviceNode().startsWith( "/dev/zram") ||
isIso9660( *it ) ) isIso9660( *it ) )
it = devices.erase( it ); it = devices.erase( it );
@ -171,6 +171,7 @@ PartitionCoreModule::doInit()
m_deviceInfos << deviceInfo; m_deviceInfos << deviceInfo;
cDebug() << device->deviceNode() << device->capacity() << device->name() << device->prettyName(); cDebug() << device->deviceNode() << device->capacity() << device->name() << device->prettyName();
} }
cDebug() << ".." << devices.count() << "devices detected.";
m_deviceModel->init( devices ); m_deviceModel->init( devices );
// The following PartUtils::runOsprober call in turn calls PartUtils::canBeResized, // The following PartUtils::runOsprober call in turn calls PartUtils::canBeResized,

5
src/modules/partition/core/PartitionIterator.cpp
View File

@ -2,6 +2,7 @@
* *
* Copyright 2014, Aurélien Gâteau <agateau@kde.org> * Copyright 2014, Aurélien Gâteau <agateau@kde.org>
* Copyright 2015, Teo Mrnjavac <teo@kde.org> * Copyright 2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, Adriaan de Groot <groot@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -83,6 +84,8 @@ PartitionIterator::operator!=( const PartitionIterator& other ) const
PartitionIterator PartitionIterator
PartitionIterator::begin( Device* device ) PartitionIterator::begin( Device* device )
{ {
if ( !device )
return PartitionIterator( nullptr );
Q_ASSERT(device); Q_ASSERT(device);
PartitionTable* table = device->partitionTable(); PartitionTable* table = device->partitionTable();
if ( !table ) if ( !table )
@ -106,6 +109,8 @@ PartitionIterator::begin( PartitionTable* table )
PartitionIterator PartitionIterator
PartitionIterator::end( Device* device ) PartitionIterator::end( Device* device )
{ {
if ( !device )
return PartitionIterator( nullptr );
PartitionTable* table = device->partitionTable(); PartitionTable* table = device->partitionTable();
if ( !table ) if ( !table )
return PartitionIterator( nullptr ); return PartitionIterator( nullptr );