From 41c85b16d34f4180eff6a8673e2243e84d018bc6 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sun, 5 Aug 2012 16:51:56 +0200 Subject: [PATCH] Changed: #1440 Forgot something --HG-- branch : build_pipeline_v3 --- .../service/pipeline_process_impl_toollog.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/code/nel/tools/pipeline/service/pipeline_process_impl_toollog.cpp b/code/nel/tools/pipeline/service/pipeline_process_impl_toollog.cpp index c32b49356..018745985 100644 --- a/code/nel/tools/pipeline/service/pipeline_process_impl_toollog.cpp +++ b/code/nel/tools/pipeline/service/pipeline_process_impl_toollog.cpp @@ -249,13 +249,17 @@ void CPipelineProcessImpl::parseToolLog(const std::string &dependLogFile, const { for (std::map::iterator it = metaDepends.begin(), end = metaDepends.end(); it != end; ++it) { - for (std::vector::iterator sub_it = wildcard_it->second.Dependencies.begin(), sub_end = wildcard_it->second.Dependencies.end(); sub_it != sub_end; ++sub_it) - it->second.Dependencies.push_back(*sub_it); - for (std::vector::iterator sub_it = wildcard_it->second.DirectoryDependencies.begin(), sub_end = wildcard_it->second.DirectoryDependencies.end(); sub_it != sub_end; ++sub_it) - it->second.DirectoryDependencies.push_back(*sub_it); - for (std::vector::iterator sub_it = wildcard_it->second.RuntimeDependencies.begin(), sub_end = wildcard_it->second.RuntimeDependencies.end(); sub_it != sub_end; ++sub_it) - it->second.RuntimeDependencies.push_back(*sub_it); + if (it->first != "*") + { + for (std::vector::iterator sub_it = wildcard_it->second.Dependencies.begin(), sub_end = wildcard_it->second.Dependencies.end(); sub_it != sub_end; ++sub_it) + it->second.Dependencies.push_back(*sub_it); + for (std::vector::iterator sub_it = wildcard_it->second.DirectoryDependencies.begin(), sub_end = wildcard_it->second.DirectoryDependencies.end(); sub_it != sub_end; ++sub_it) + it->second.DirectoryDependencies.push_back(*sub_it); + for (std::vector::iterator sub_it = wildcard_it->second.RuntimeDependencies.begin(), sub_end = wildcard_it->second.RuntimeDependencies.end(); sub_it != sub_end; ++sub_it) + it->second.RuntimeDependencies.push_back(*sub_it); + } } + metaDepends.erase(wildcard_it); } // Write depend meta files