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

Netinstall: fix datatype passed to packages module

Browse Source 
- Each element of the (list) packageOperations needs to be a
   package operation, which is a dictionary with keys (identifying actions)
   and lists of packages (which may be strings or script-info dictionaries).
This commit is contained in:
Adriaan de Groot 2017-10-23 11:10:18 -04:00
parent aabcd6ba86
commit 4314f2c4ad
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/netinstall/NetInstallViewStep.cpp
View File

@ -126,10 +126,11 @@ NetInstallViewStep::onLeave()
cDebug() << "Leaving netinstall, adding packages to be installed" cDebug() << "Leaving netinstall, adding packages to be installed"
<< "to global storage"; << "to global storage";
QMap<QString, QVariant> packagesWithOperation;
QList<PackageTreeItem::ItemData> packages = m_widget->selectedPackages(); QList<PackageTreeItem::ItemData> packages = m_widget->selectedPackages();
QVariantList installPackages; QVariantList installPackages;
QVariantList tryInstallPackages; QVariantList tryInstallPackages;
QVariantList packageOperations;
cDebug() << "Processing"; cDebug() << "Processing";
for ( auto package : packages ) for ( auto package : packages )
@ -145,14 +146,22 @@ NetInstallViewStep::onLeave()
} }
if ( !installPackages.empty() ) if ( !installPackages.empty() )
packagesWithOperation.insert( "install", QVariant( installPackages ) ); {
QMap<QString, QVariant> op;
op.insert( "install", QVariant( installPackages ) );
packageOperations.append(op);
}
if ( !tryInstallPackages.empty() ) if ( !tryInstallPackages.empty() )
packagesWithOperation.insert( "try_install", QVariant( tryInstallPackages ) ); {
QMap<QString, QVariant> op;
op.insert( "try_install", QVariant( tryInstallPackages ) );
packageOperations.append(op);
}
if ( !packagesWithOperation.isEmpty() ) if ( !packageOperations.isEmpty() )
{ {
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
gs->insert( "packageOperations", QVariant( packagesWithOperation ) ); gs->insert( "packageOperations", QVariant( packageOperations ) );
} }
} }