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

[machineid] Drop trailing \n, toInt() doesn't like it

Browse Source
This commit is contained in:
Adriaan de Groot 2019-10-04 18:05:29 +02:00
parent 9e359c98a9
commit 642dbf449c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/machineid/Workers.cpp
View File

@ -81,6 +81,10 @@ getUrandomPoolSize()
QByteArray v = f.read( 16 ); QByteArray v = f.read( 16 );
if ( v.length() > 2 ) if ( v.length() > 2 )
{ {
if ( v.endsWith( '\n' ) )
{
v.chop(1);
}
bool ok = false; bool ok = false;
poolSize = v.toInt( &ok ); poolSize = v.toInt( &ok );
if ( !ok ) if ( !ok )
@ -89,7 +93,7 @@ getUrandomPoolSize()
} }
} }
} }
return poolSize >= minimumPoolSize ? poolSize : minimumPoolSize; return (poolSize >= minimumPoolSize) ? poolSize : minimumPoolSize;
} }
Calamares::JobResult Calamares::JobResult