ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: check validity of Python environment when entered in Python Source Group

Browse Source 
* Python sourcegroup now displays if a provided Python environment is valid
* update used version of SourcetrailPythonIndexer
* changed executeProcess() to return the process' exit code and console output
This commit is contained in:
mlangkabel
2019-05-28 16:44:50 +02:00
parent b607933e0f
commit 31f4e47903
15 changed files with 92 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/utility/utilityApp.cpp
+4 -4
View File
@@ -52,7 +52,7 @@ namespace utility
std::set<QProcess*> s_runningProcesses;
}
std::string utility::executeProcess(const std::string& command, const FilePath& workingDirectory, const int timeout)
std::pair<int, std::string> utility::executeProcess(const std::string& command, const FilePath& workingDirectory, const int timeout)
{
QProcess process;
process.setProcessChannelMode(QProcess::MergedChannels);
@@ -81,11 +81,11 @@ std::string utility::executeProcess(const std::string& command, const FilePath&
// QProcess::ProcessError error = process.error();
std::string processoutput = process.readAll().toStdString();
const std::string processoutput = process.readAll().toStdString();
const int exitCode = process.exitCode();
process.close();
processoutput = utility::trim(processoutput);
return processoutput;
return std::make_pair(exitCode, utility::trim(processoutput));
}
std::string utility::executeProcessUntilNoOutput(const std::string& command, const FilePath& workingDirectory, const int waitTime)