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

[packagechooser] Ensure multiple instances don't override the GS values

Browse Source
This commit is contained in:
dalto 2022-01-19 16:48:56 -06:00
parent b4ac6b73c8
commit 2aa8c2f0e0
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/modules/packagechooser/Config.cpp
View File

@ -132,13 +132,46 @@ Config::updateGlobalStorage( const QStringList& selected ) const
} }
else else
{ {
Calamares::JobQueue::instance()->globalStorage()->insert( "NetinstallAdd", netinstallDataList ); auto* gs = Calamares::JobQueue::instance()->globalStorage();
// If an earlier packagechooser instance added this data to global storage, combine them
if ( gs->contains( "NetinstallAdd" ) )
{
auto netinstallAddOrig = gs->value( "NetinstallAdd" );
if ( netinstallAddOrig.canConvert( QVariant::List ) )
{
netinstallDataList += netinstallAddOrig.toList();
}
else
{
cWarning() << "Invalid NetinstallAdd data in global storage. Earlier selections purged";
}
gs->remove( "NetinstallAdd" );
}
gs->insert( "NetinstallAdd", netinstallDataList );
} }
} }
else if ( m_method == PackageChooserMethod::NetSelect ) else if ( m_method == PackageChooserMethod::NetSelect )
{ {
cDebug() << m_defaultId << "groups to select in netinstall" << selected; cDebug() << m_defaultId << "groups to select in netinstall" << selected;
Calamares::JobQueue::instance()->globalStorage()->insert( "NetinstallSelect", selected ); QStringList newSelected = selected;
auto* gs = Calamares::JobQueue::instance()->globalStorage();
// If an earlier packagechooser instance added this data to global storage, combine them
if ( gs->contains( "NetinstallSelect" ) )
{
auto selectedOrig = gs->value( "NetinstallSelect" );
if ( selectedOrig.canConvert( QVariant::StringList ) )
{
newSelected += selectedOrig.toStringList();
}
else
{
cWarning() << "Invalid NetinstallSelect data in global storage. Earlier selections purged";
}
gs->remove( "NetinstallSelect" );
}
gs->insert( "NetinstallSelect", newSelected );
} }
else else
{ {