From 07e589ef8e13bbd93ca84a20afae9631eeabcfd4 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 29 May 2009 11:34:06 +0200
Subject: [PATCH] Fixed b390e56d676cd0a838e4b59b51b431535f760bb0
Do not check for existence of the binary, breaks on Windows
due to .exe (and potentially paths). Use waitForStarted().
On this occasion, kill on timeout in case of password prompts.
---
src/plugins/git/gitcommand.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/plugins/git/gitcommand.cpp b/src/plugins/git/gitcommand.cpp
index e3fcd8571bf..77b945802ef 100644
--- a/src/plugins/git/gitcommand.cpp
+++ b/src/plugins/git/gitcommand.cpp
@@ -104,10 +104,6 @@ void GitCommand::execute()
if (m_jobs.empty())
return;
- if(!QFileInfo(m_binaryPath).exists()){
- emit errorText(QLatin1String("Error: Git not found.")+m_binaryPath);
- return;
- }
// For some reason QtConcurrent::run() only works on this
QFuture<void> task = QtConcurrent::run(this, &GitCommand::run);
const QString taskName = QLatin1String("Git ") + m_jobs.front().arguments.at(0);
@@ -137,8 +133,15 @@ void GitCommand::run()
qDebug() << "GitCommand::run" << j << '/' << count << m_jobs.at(j).arguments;
process.start(m_binaryPath, m_jobs.at(j).arguments);
+ if(!process.waitForStarted()) {
+ ok = false;
+ error += QString::fromLatin1("Error: \"%1\" could not be started: %2").arg(m_binaryPath, process.errorString());
+ break;
+ }
+
process.closeWriteChannel();
if (!process.waitForFinished(m_jobs.at(j).timeout * 1000)) {
+ process.terminate();
ok = false;
error += QLatin1String("Error: Git timed out");
break;
--
GitLab