From a657d7388cdbea6c0363034829b7eae2d7f3fbd7 Mon Sep 17 00:00:00 2001 From: dalto Date: Sun, 23 Jan 2022 14:47:14 -0600 Subject: [PATCH] [packagechooser] Remove obsolete functionality from netinstall-add --- src/modules/packagechooser/Config.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index c573889ab..ffe816f17 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -132,23 +132,7 @@ Config::updateGlobalStorage( const QStringList& selected ) const } else { - 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 ); + Calamares::JobQueue::instance()->globalStorage()->insert( "NetinstallAdd", netinstallDataList ); } } else if ( m_method == PackageChooserMethod::NetSelect )