applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-26 08:58:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

made requested changes

Browse source
This commit is contained in:
Kyle Robertze 2017-01-25 10:34:18 +02:00 • committed by Teo Mrnjavac
parent f5fe887a79
commit 1d7ad9e045
9 changed files with 116 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/netinstall/NetInstallViewStep.cpp
View file

@ -1,6 +1,7 @@
/*
* Copyright 2016, Luca Giambonini <almack@chakraos.org>
* Copyright 2016, Lisa Vitolo <shainer@chakraos.org>
* Copyright 2017, Kyle Robbertze <krobbertze@gmail.com>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -126,13 +127,27 @@ NetInstallViewStep::onLeave()
<< "to global storage";
QMap<QString, QVariant> packagesWithOperation;
QList<QVariant> installPackages = m_widget->selectedPackages( true );
QList<QVariant> tryInstallPackages = m_widget->selectedPackages( false );
QList<PackageTreeItem::ItemData> packages = m_widget->selectedPackages();
QVariantList installPackages;
QVariantList tryInstallPackages;
cDebug() << "Processing";
for ( auto package : packages )
{
QMap<QString, QVariant> details;
details.insert( "pre-script", package.preScript );
details.insert( "package", package.packageName );
details.insert( "post-script", package.postScript );
if ( package.isCritical )
installPackages.append( details );
else
tryInstallPackages.append( details );
}
if ( !installPackages.empty() )
packagesWithOperation.insert( "install", installPackages );
packagesWithOperation.insert( "install", QVariant( installPackages ) );
if ( !tryInstallPackages.empty() )
packagesWithOperation.insert( "try-install", tryInstallPackages );
packagesWithOperation.insert( "try-install", QVariant( tryInstallPackages ) );
if ( !packagesWithOperation.isEmpty() )
{