mirror of
https://github.com/parchlinux/calamares.git
synced 2025-06-27 01:15:38 -04:00
[dummycpp] Replace QProcess::execute()
- hangs unpredictably during testing - replace with the Calamares process-invocation runCommand(), which is also synchronous but doesn't hang (or, hasn't, in testing so far)
This commit is contained in:
parent
c28c97d3aa
commit
e0bb53aff4
1 changed files with 5 additions and 3 deletions
|
@ -28,6 +28,7 @@
|
|||
#include "GlobalStorage.h"
|
||||
#include "JobQueue.h"
|
||||
|
||||
#include "utils/CalamaresUtilsSystem.h"
|
||||
#include "utils/Logger.h"
|
||||
|
||||
DummyCppJob::DummyCppJob( QObject* parent )
|
||||
|
@ -113,9 +114,10 @@ Calamares::JobResult
|
|||
DummyCppJob::exec()
|
||||
{
|
||||
// Ported from dummypython
|
||||
QProcess::execute( "/bin/sh",
|
||||
QStringList() << "-c"
|
||||
<< "touch ~/calamares-dummycpp" );
|
||||
CalamaresUtils::System::runCommand( CalamaresUtils::System::RunLocation::RunInHost,
|
||||
QStringList() << "/bin/sh"
|
||||
<< "-c"
|
||||
<< "touch ~/calamares-dummycpp" );
|
||||
QString accumulator = QDateTime::currentDateTimeUtc().toString( Qt::ISODate ) + '\n';
|
||||
accumulator += QStringLiteral( "Calamares version: " ) + CALAMARES_VERSION_SHORT + '\n';
|
||||
accumulator += QStringLiteral( "This job's name: " ) + prettyName() + '\n';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue