summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-06-23 13:06:13 (GMT)
committerBrad King <brad.king@kitware.com>2009-06-23 13:06:13 (GMT)
commit66953c78a9457e9e73db5a35816333223e6414ae (patch)
treedceba8d80b74c34ec4871515867fe57495b1a7aa
parent13f519f74744dd8ffad3a19f199ad08f7a751ba6 (diff)
downloadCMake-66953c78a9457e9e73db5a35816333223e6414ae.zip
CMake-66953c78a9457e9e73db5a35816333223e6414ae.tar.gz
CMake-66953c78a9457e9e73db5a35816333223e6414ae.tar.bz2
BUG: Fix CVS update parsing for TortoiseCVS
The TortoiseCVS version of cvs.exe includes the '.exe' in cvs update messages for files removed from the repository. This change accounts for it in the regular expressions that match such lines. Now removed files are properly reported by ctest_update() when using TortoiseCVS.
-rw-r--r--Source/CTest/cmCTestCVS.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestCVS.cxx b/Source/CTest/cmCTestCVS.cxx
index cbd201e..18ec0ec 100644
--- a/Source/CTest/cmCTestCVS.cxx
+++ b/Source/CTest/cmCTestCVS.cxx
@@ -44,9 +44,10 @@ public:
this->RegexFileModified.compile("^([MRA]) *(.*)");
this->RegexFileConflicting.compile("^([C]) *(.*)");
this->RegexFileRemoved1.compile(
- "cvs update: `?([^']*)'? is no longer in the repository");
+ "cvs[^ ]* update: `?([^']*)'? is no longer in the repository");
this->RegexFileRemoved2.compile(
- "cvs update: warning: `?([^']*)'? is not \\(any longer\\) pertinent");
+ "cvs[^ ]* update: "
+ "warning: `?([^']*)'? is not \\(any longer\\) pertinent");
}
private:
cmCTestCVS* CVS;