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

[users] Use right check on writing hostname

Browse Source 
- !failed() also means "didn't write the file because it already
  exists", which is sometimes acceptable -- but not here.
  Use the more-strict bool() conversion, which is only when
  the file was actually written.
This commit is contained in:
Adriaan de Groot 2020-02-24 12:44:50 +01:00
parent 862b7e34df
commit 4621937477
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/users/SetHostNameJob.cpp
View File

@ -61,9 +61,8 @@ SetHostNameJob::prettyStatusMessage() const
STATICTEST bool STATICTEST bool
setFileHostname( const QString& hostname ) setFileHostname( const QString& hostname )
{ {
return !( CalamaresUtils::System::instance() return CalamaresUtils::System::instance()->createTargetFile( QStringLiteral( "/etc/hostname" ),
->createTargetFile( QStringLiteral( "/etc/hostname" ), ( hostname + '\n' ).toUtf8() ) ( hostname + '\n' ).toUtf8() );
.failed() );
} }
STATICTEST bool STATICTEST bool
@ -78,9 +77,8 @@ ff02::1 ip6-allnodes
ff02::2 ip6-allrouters ff02::2 ip6-allrouters
)"; )";
return !( CalamaresUtils::System::instance() return CalamaresUtils::System::instance()->createTargetFile( QStringLiteral( "/etc/hosts" ),
->createTargetFile( QStringLiteral( "/etc/hosts" ), QString( etc_hosts ).arg( hostname ).toUtf8() ) QString( etc_hosts ).arg( hostname ).toUtf8() );
.failed() );
} }
STATICTEST bool STATICTEST bool