applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 19:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into software-chooser

Browse source 
- Pull in build fix
This commit is contained in:
Adriaan de Groot 2019-08-04 16:02:16 +02:00
commit 89dcae393e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libcalamaresui/viewpages/PythonQtUtilsWrapper.cpp
View file

@ -57,7 +57,7 @@ Utils::target_env_call( const QString& command,
int timeout ) const
{
return CalamaresUtils::System::instance()->
targetEnvCall( command, QString(), stdin, timeout );
targetEnvCall( command, QString(), stdin, std::chrono::seconds( timeout > 0 ? timeout : 0 ) );
}
@ -67,7 +67,7 @@ Utils::target_env_call( const QStringList& args,
int timeout ) const
{
return CalamaresUtils::System::instance()->
targetEnvCall( args, QString(), stdin, timeout );
targetEnvCall( args, QString(), stdin, std::chrono::seconds( timeout > 0 ? timeout : 0 ) );
}
@ -102,7 +102,7 @@ Utils::check_target_env_output( const QString& command,
output,
QString(),
stdin,
timeout );
std::chrono::seconds( timeout > 0 ? timeout : 0 ) );
_handle_check_target_env_call_error( ec, command );
return output;
}
@ -119,7 +119,7 @@ Utils::check_target_env_output( const QStringList& args,
output,
QString(),
stdin,
timeout );
std::chrono::seconds( timeout > 0 ? timeout : 0 ) );
_handle_check_target_env_call_error( ec, args.join( ' ' ) );
return output;
}