aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/clearcase
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2013-11-22 09:11:51 +0100
committerEike Ziller <eike.ziller@digia.com>2013-11-22 09:11:51 +0100
commit559e66cb353c510c2d624d60a6d28a37fa66dcb0 (patch)
treee8cf129eaafdd6167e62427f8aa5ec3a2321b7b5 /src/plugins/clearcase
parent759fd36a1eebb6af878b95484e9dc2ef91b90580 (diff)
parentcf3a9b019204e734324f9eedd128f2547e4a2e79 (diff)
Merge remote-tracking branch 'origin/3.0'
Diffstat (limited to 'src/plugins/clearcase')
-rw-r--r--src/plugins/clearcase/clearcaseplugin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 4c08a10556b..a08ec4e96df 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -1551,7 +1551,7 @@ bool ClearCasePlugin::vcsOpen(const QString &workingDir, const QString &fileName
QFile::rename(absPath + QLatin1String(".hijack"), absPath);
}
- if ((!response.error || response.stdOut.contains(QLatin1String("already checked out")))
+ if ((!response.error || response.stdErr.contains(QLatin1String("already checked out")))
&& !m_settings.disableIndexer) {
setStatus(absPath, FileStatus::CheckedOut);
}
@@ -1683,7 +1683,7 @@ bool ClearCasePlugin::ccFileOp(const QString &workingDir, const QString &title,
runCleartool(workingDir, args, m_settings.timeOutMS(),
ShowStdOutInLogWindow | FullySynchronously);
if (coResponse.error) {
- if (coResponse.stdOut.contains(QLatin1String("already checked out")))
+ if (coResponse.stdErr.contains(QLatin1String("already checked out")))
noCheckout = true;
else
return false;