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

[packagechooser] Remove obsolete functionality from netinstall-add

Browse Source
This commit is contained in:
dalto 2022-01-23 14:47:14 -06:00
parent f4c2db7f21
commit a657d7388c
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,23 +132,7 @@ Config::updateGlobalStorage( const QStringList& selected ) const
} }
else else
{ {
auto* gs = Calamares::JobQueue::instance()->globalStorage(); Calamares::JobQueue::instance()->globalStorage()->insert( "NetinstallAdd", netinstallDataList );
// 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 )