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

/etc/mtab reports a file size of 0, so using .atEnd() may not work. Read the file until it doesn't return more data.

Browse Source 
Use QTextStream because it takes care of the conversion between 8-bit and 16-bit.
http://doc.qt.io/qt-5/qfile.html#using-streams-to-read-files
This commit is contained in:
Ramon Buldó 2015-02-28 16:44:09 +01:00
parent 642b4be1f2
commit fb3072bbbb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/partition/jobs/ClearTempMountsJob.cpp
View File

@ -49,10 +49,11 @@ ClearTempMountsJob::exec()
return Calamares::JobResult::error( tr( "Cannot get list of temporary mounts." ) ); return Calamares::JobResult::error( tr( "Cannot get list of temporary mounts." ) );
cDebug() << "Opened mtab. Lines:"; cDebug() << "Opened mtab. Lines:";
while ( !mtab.atEnd() ) QTextStream in(&mtab);
QString lineIn = in.readLine();
while ( !lineIn.isNull() )
{ {
QStringList line = QString::fromLocal8Bit( mtab.readLine() ) QStringList line = lineIn.split( ' ', QString::SkipEmptyParts );
.split( ' ', QString::SkipEmptyParts );
cDebug() << line.join( ' ' ); cDebug() << line.join( ' ' );
QString device = line.at( 0 ); QString device = line.at( 0 );
QString mountPoint = line.at( 1 ); QString mountPoint = line.at( 1 );
@ -61,6 +62,7 @@ ClearTempMountsJob::exec()
cDebug() << "INSERTING pair (device, mountPoint)" << device << mountPoint; cDebug() << "INSERTING pair (device, mountPoint)" << device << mountPoint;
lst.append( qMakePair( device, mountPoint ) ); lst.append( qMakePair( device, mountPoint ) );
} }
lineIn = in.readLine();
} }
qSort( lst.begin(), lst.end(), []( const QPair< QString, QString >& a, qSort( lst.begin(), lst.end(), []( const QPair< QString, QString >& a,