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

[libcalamares] Make keys case-insensitive (as documented)

Browse Source
This commit is contained in:
Adriaan de Groot 2021-02-08 14:47:55 +01:00
parent 48541629f9
commit 9665af0e5a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libcalamares/partition/Global.cpp
View File

@ -25,9 +25,10 @@ CalamaresUtils::Partition::isFilesystemUsedGS( const Calamares::GlobalStorage* g
return false; return false;
} }
const QVariantMap fsUse = gs->value( fsUse_key ).toMap(); const QVariantMap fsUse = gs->value( fsUse_key ).toMap();
if ( fsUse.contains( filesystemType ) ) QString key = filesystemType.toLower();
if ( fsUse.contains( key ) )
{ {
const auto v = fsUse.value( filesystemType ); const auto v = fsUse.value( key );
return v.toBool(); return v.toBool();
} }
return false; return false;
@ -39,7 +40,8 @@ CalamaresUtils::Partition::useFilesystemGS( Calamares::GlobalStorage* gs, const
if ( gs ) if ( gs )
{ {
QVariantMap existingMap = gs->contains( fsUse_key ) ? gs->value( fsUse_key ).toMap() : QVariantMap(); QVariantMap existingMap = gs->contains( fsUse_key ) ? gs->value( fsUse_key ).toMap() : QVariantMap();
existingMap.insert( filesystemType, used ); QString key = filesystemType.toLower();
existingMap.insert( key, used );
gs->insert( fsUse_key, existingMap ); gs->insert( fsUse_key, existingMap );
} }
} }