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

Store osprober output in GlobalStorage.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-12-19 15:03:27 +01:00
parent aa70a4b2dd
commit f8f005f53c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/partition/gui/PartitionViewStep.cpp
View File

@ -91,6 +91,7 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
} }
QString osProberReport( "Osprober lines, clean:\n" ); QString osProberReport( "Osprober lines, clean:\n" );
QStringList osproberCleanLines;
OsproberEntryList osproberEntries; OsproberEntryList osproberEntries;
foreach ( const QString& line, osproberOutput.split( '\n' ) ) foreach ( const QString& line, osproberOutput.split( '\n' ) )
{ {
@ -108,10 +109,12 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
continue; continue;
osproberEntries.append( { prettyName, path, canBeResized( path ), lineColumns } ); osproberEntries.append( { prettyName, path, canBeResized( path ), lineColumns } );
osProberReport.append( line ); osproberCleanLines.append( line );
} }
} }
osProberReport.append( osproberCleanLines.join( '\n' ) );
cDebug() << osProberReport; cDebug() << osProberReport;
Calamares::JobQueue::instance()->globalStorage()->insert( "osproberLines", osproberCleanLines );
m_choicePage->init( m_core, osproberEntries ); m_choicePage->init( m_core, osproberEntries );
m_erasePage->init( m_core ); m_erasePage->init( m_core );