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

[libcalamares] Expand error-logging when creating files

Browse Source
This commit is contained in:
Adriaan de Groot 2021-12-06 12:29:03 +01:00
parent 6ef7acc108
commit 890c17cd71
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libcalamares/utils/CalamaresUtilsSystem.cpp
View File

@ -115,12 +115,14 @@ System::createTargetFile( const QString& path, const QByteArray& contents, Write
QString completePath = targetPath( path ); QString completePath = targetPath( path );
if ( completePath.isEmpty() ) if ( completePath.isEmpty() )
{ {
cWarning() << "No target path for" << path;
return CreationResult( CreationResult::Code::Invalid ); return CreationResult( CreationResult::Code::Invalid );
} }
QFile f( completePath ); QFile f( completePath );
if ( ( mode == WriteMode::KeepExisting ) && f.exists() ) if ( ( mode == WriteMode::KeepExisting ) && f.exists() )
{ {
cWarning() << "Target file" << completePath << "already exists";
return CreationResult( CreationResult::Code::AlreadyExists ); return CreationResult( CreationResult::Code::AlreadyExists );
} }
@ -133,13 +135,16 @@ System::createTargetFile( const QString& path, const QByteArray& contents, Write
if ( !f.open( m ) ) if ( !f.open( m ) )
{ {
cWarning() << "Could not open target file" << completePath;
return CreationResult( CreationResult::Code::Failed ); return CreationResult( CreationResult::Code::Failed );
} }
if ( f.write( contents ) != contents.size() ) auto written = f.write( contents );
if ( written != contents.size() )
{ {
f.close(); f.close();
f.remove(); f.remove();
cWarning() << "Short write (" << written << "out of" << contents.size() << "bytes) to" << completePath;
return CreationResult( CreationResult::Code::Failed ); return CreationResult( CreationResult::Code::Failed );
} }