From 890c17cd71b2126e0a20f42fa9025b0f6358f62b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 6 Dec 2021 12:29:03 +0100 Subject: [PATCH] [libcalamares] Expand error-logging when creating files --- src/libcalamares/utils/CalamaresUtilsSystem.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp index 301d20b33..9a4ba990f 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp +++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp @@ -115,12 +115,14 @@ System::createTargetFile( const QString& path, const QByteArray& contents, Write QString completePath = targetPath( path ); if ( completePath.isEmpty() ) { + cWarning() << "No target path for" << path; return CreationResult( CreationResult::Code::Invalid ); } QFile f( completePath ); if ( ( mode == WriteMode::KeepExisting ) && f.exists() ) { + cWarning() << "Target file" << completePath << "already exists"; return CreationResult( CreationResult::Code::AlreadyExists ); } @@ -133,13 +135,16 @@ System::createTargetFile( const QString& path, const QByteArray& contents, Write if ( !f.open( m ) ) { + cWarning() << "Could not open target file" << completePath; return CreationResult( CreationResult::Code::Failed ); } - if ( f.write( contents ) != contents.size() ) + auto written = f.write( contents ); + if ( written != contents.size() ) { f.close(); f.remove(); + cWarning() << "Short write (" << written << "out of" << contents.size() << "bytes) to" << completePath; return CreationResult( CreationResult::Code::Failed ); }