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

[partition] Fix build w/ "3.3.1" API

Browse Source 
- Need older-style scanning, but new-style iteration
This commit is contained in:
Adriaan de Groot 2019-04-12 12:54:13 +02:00
parent 4e24ea29e2
commit c844188907
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -683,14 +683,17 @@ PartitionCoreModule::scanForLVMPVs()
} }
} }
#ifdef WITH_KPMCORE4API #if defined( WITH_KPMCORE4API )
VolumeManagerDevice::scanDevices( physicalDevices ); VolumeManagerDevice::scanDevices( physicalDevices );
for ( auto p : LVM::pvList::list() )
#else
#if defined( WITH_KPMCORE331API )
LvmDevice::scanSystemLVM( physicalDevices );
for ( auto p : LVM::pvList::list() ) for ( auto p : LVM::pvList::list() )
#else #else
LvmDevice::scanSystemLVM( physicalDevices ); LvmDevice::scanSystemLVM( physicalDevices );
for ( auto p : LVM::pvList ) for ( auto p : LVM::pvList )
#endif
#endif #endif
{ {
m_lvmPVs << p.partition().data(); m_lvmPVs << p.partition().data();