From c844188907fa71353c2e3a1ac8c7ea35df2f9063 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 12 Apr 2019 12:54:13 +0200 Subject: [PATCH] [partition] Fix build w/ "3.3.1" API - Need older-style scanning, but new-style iteration --- src/modules/partition/core/PartitionCoreModule.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index df331f04b..f50510da7 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -683,14 +683,17 @@ PartitionCoreModule::scanForLVMPVs() } } -#ifdef WITH_KPMCORE4API +#if defined( WITH_KPMCORE4API ) VolumeManagerDevice::scanDevices( physicalDevices ); - + for ( auto p : LVM::pvList::list() ) +#else +#if defined( WITH_KPMCORE331API ) + LvmDevice::scanSystemLVM( physicalDevices ); for ( auto p : LVM::pvList::list() ) #else LvmDevice::scanSystemLVM( physicalDevices ); - for ( auto p : LVM::pvList ) +#endif #endif { m_lvmPVs << p.partition().data();