Commit 7a3ff861 authored by Knut Petter Svendsen's avatar Knut Petter Svendsen

ClearCase: Fix: File operations in already checked out dirs

cleartool reports errors to stdErr not stdOut.

Change-Id: Ice47e40f56157d52f8e4f73ba6ed8d87ad39f3c4
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 1f837610
......@@ -1526,7 +1526,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);
}
......@@ -1658,7 +1658,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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment