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

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 int timeout ) const
{ {
return CalamaresUtils::System::instance()-> 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 int timeout ) const
{ {
return CalamaresUtils::System::instance()-> 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, output,
QString(), QString(),
stdin, stdin,
timeout ); std::chrono::seconds( timeout > 0 ? timeout : 0 ) );
_handle_check_target_env_call_error( ec, command ); _handle_check_target_env_call_error( ec, command );
return output; return output;
} }
@ -119,7 +119,7 @@ Utils::check_target_env_output( const QStringList& args,
output, output,
QString(), QString(),
stdin, stdin,
timeout ); std::chrono::seconds( timeout > 0 ? timeout : 0 ) );
_handle_check_target_env_call_error( ec, args.join( ' ' ) ); _handle_check_target_env_call_error( ec, args.join( ' ' ) );
return output; return output;
} }