From ce3e09318a7fa343949dc232f7a8e05ae3024a88 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 24 May 2018 07:03:19 -0400 Subject: [PATCH] [preservefiles] Improve failure messages --- src/modules/preservefiles/PreserveFiles.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/modules/preservefiles/PreserveFiles.cpp b/src/modules/preservefiles/PreserveFiles.cpp index 6490f8303..29564fcd1 100644 --- a/src/modules/preservefiles/PreserveFiles.cpp +++ b/src/modules/preservefiles/PreserveFiles.cpp @@ -148,10 +148,15 @@ Calamares::JobResult PreserveFiles::exec() void PreserveFiles::setConfigurationMap(const QVariantMap& configurationMap) { auto files = configurationMap[ "files" ]; - - if ( ! ( files.isValid() && ( files.type() == QVariant::List ) ) ) + if ( !files.isValid() ) { - 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; }