This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via aedbd25e061fc348bd2b88862956d972a955059b (commit)
via 7bad99b0d3fb50853937d99cd68eb340a0975156 (commit)
from d3c7c8008643475c656562837bf3c072e57ef799 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aedbd25e061fc348bd2b88862956d972a955059b
commit aedbd25e061fc348bd2b88862956d972a955059b
Merge: d3c7c80 7bad99b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 11 13:51:56 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 11 13:51:56 2017 -0500
Merge topic 'cmFileMonitor-skip-empty-names' into next
7bad99b0 cmake-server: Do not try watching subdirectories with empty names
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bad99b0d3fb50853937d99cd68eb340a0975156
commit 7bad99b0d3fb50853937d99cd68eb340a0975156
Author: Aleix Pol <aleix...@kde.org>
AuthorDate: Wed Jan 11 19:08:04 2017 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 11 13:48:41 2017 -0500
cmake-server: Do not try watching subdirectories with empty names
`cmsys::SystemTools::SplitPath` will return empty segments on paths
where there's duplicaded consequent slashes (e.g. `/home/dir/my//stuff`).
This makes the cmFileWatcher choke. Teach cmFileMonitor to skip these
empty segments.
Closes: #16531
diff --git a/Source/cmFileMonitor.cxx b/Source/cmFileMonitor.cxx
index ea37683..815de95 100644
--- a/Source/cmFileMonitor.cxx
+++ b/Source/cmFileMonitor.cxx
@@ -331,6 +331,9 @@ void cmFileMonitor::MonitorPaths(const
std::vector<std::string>& paths,
rootSegment)); // Can not be both filename and root part of the path!
const std::string& currentSegment = pathSegments[i];
+ if (currentSegment.empty()) {
+ continue;
+ }
cmIBaseWatcher* nextWatcher = currentWatcher->Find(currentSegment);
if (!nextWatcher) {
-----------------------------------------------------------------------
Summary of changes:
Source/cmFileMonitor.cxx | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
