applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 09:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[packagechooser] Be more clear on the resulting GS keys

Browse source 
- in legacy mode, *id* can have an effect and leads to
  "packagechooser_<id>"; if unset, uses the the module
  instance id instead, still as "packagechooser_<instanceid>".
- in packages mode, *id* is not used and only the whole
  module Id (generally, "packagechooser@<instanceid>")
  is used, but in packages mode there's no need for other
  packages to mess with GS settings for this packagechooser.
This commit is contained in:
Adriaan de Groot 2021-04-23 22:29:26 +02:00
parent aa3633e43a
commit f4fe0881b9
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/modules/packagechooser/Config.cpp
View file

@ -90,20 +90,16 @@ Config::introductionPackage() const
void
Config::updateGlobalStorage( const QStringList& selected ) const
{
const QString& key = m_id;
cDebug() << "Writing to GS" << key;
if ( m_method == PackageChooserMethod::Legacy )
{
QString value = selected.join( ',' );
Calamares::JobQueue::instance()->globalStorage()->insert( key, value );
cDebug() << Logger::SubEntry << "PackageChooser" << key << "selected" << value;
Calamares::JobQueue::instance()->globalStorage()->insert( m_id, value );
cDebug() << m_id<< "selected" << value;
}
else if ( m_method == PackageChooserMethod::Packages )
{
QStringList packageNames = m_model->getInstallPackagesForNames( selected );
cDebug() << Logger::SubEntry << "Got packages" << packageNames;
cDebug() << m_defaultId << "packages to install" << packageNames;
CalamaresUtils::Packages::setGSPackageAdditions(
Calamares::JobQueue::instance()->globalStorage(), m_defaultId, packageNames );
}
@ -181,20 +177,27 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ),
PackageChooserMethod::Legacy );
if ( m_method == PackageChooserMethod::Legacy )
{
const QString configId = CalamaresUtils::getString( configurationMap, "id" );
const QString base = QStringLiteral( "packagechooser_" );
if ( configId.isEmpty() )
{
m_id = m_defaultId.toString();
if ( m_id.isEmpty() )
if ( m_defaultId.id().isEmpty() )
{
m_id = QString( "packagechooser" );
// We got nothing to work with
m_id = base;
}
else
{
m_id = base + m_defaultId.id();
}
cDebug() << "Using default ID" << m_id << "from" << m_defaultId.toString();
}
else
{
m_id = QStringLiteral( "packagechooser_" ) + configId;
m_id = base + configId;
cDebug() << "Using configured ID" << m_id;
}
}