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

[preservefiles] Improve failure messages

Browse Source
This commit is contained in:
Adriaan de Groot 2018-05-24 07:03:19 -04:00
parent 28a42a7230
commit ce3e09318a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/preservefiles/PreserveFiles.cpp
View File

@ -148,10 +148,15 @@ Calamares::JobResult PreserveFiles::exec()
void PreserveFiles::setConfigurationMap(const QVariantMap& configurationMap) void PreserveFiles::setConfigurationMap(const QVariantMap& configurationMap)
{ {
auto files = configurationMap[ "files" ]; auto files = configurationMap[ "files" ];
if ( !files.isValid() )
if ( ! ( files.isValid() && ( files.type() == QVariant::List ) ) )
{ {
cDebug() << "No files: configuration key, or not a list."; cDebug() << "No 'files' key for preservefiles.";
return;
}
if ( files.type() != QVariant::List )
{
cDebug() << "Configuration key 'files' is not a list for preservefiles.";
return; return;
} }