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 52682a93ab3b7b3678968504432258149cea0f67 (commit) via 21007f898952d74a4db38a9259d946c7d9a06eb3 (commit) from 6c78fb12aa6b361002131d4590bec7a68992972c (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 ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52682a93ab3b7b3678968504432258149cea0f67 commit 52682a93ab3b7b3678968504432258149cea0f67 Merge: 6c78fb1 21007f8 Author: Eric Noulard <eric.noul...@gmail.com> AuthorDate: Sat Mar 19 06:14:23 2011 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Mar 19 06:14:23 2011 -0400 Merge topic 'CPackDeb-fixTestCrash' into next 21007f8 CPack fix CPackDeb crash when CPackDeb.cmake ends with a FATAL_ERROR http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21007f898952d74a4db38a9259d946c7d9a06eb3 commit 21007f898952d74a4db38a9259d946c7d9a06eb3 Author: Eric NOULARD <eric.noul...@gmail.com> AuthorDate: Sat Mar 19 11:12:31 2011 +0100 Commit: Eric NOULARD <eric.noul...@gmail.com> CommitDate: Sat Mar 19 11:12:31 2011 +0100 CPack fix CPackDeb crash when CPackDeb.cmake ends with a FATAL_ERROR diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index d3320c0..ca2185c 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -96,6 +96,7 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup) cmCPackLogger(cmCPackLog::LOG_ERROR, "Error while execution CPackDeb.cmake" << std::endl); retval = 0; + return retval; } cmsys::Glob gl; @@ -105,7 +106,7 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup) if ( !gl.FindFiles(findExpr) ) { cmCPackLogger(cmCPackLog::LOG_ERROR, - "Cannot find any files in the installed directory" << std::endl); + "Cannot find any files in the installed directory" << std::endl); return 0; } packageFiles = gl.GetFiles(); @@ -152,8 +153,8 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup) cmCPackLogger(cmCPackLog::LOG_ERROR, "Error while execution CPackDeb.cmake" << std::endl); retval = 0; + return retval; } - cmsys::Glob gl; std::string findExpr(this->GetOption("WDIR")); findExpr += "/*"; @@ -230,6 +231,7 @@ int cmCPackDebGenerator::PackageComponentsAllInOne(bool allComponent) cmCPackLogger(cmCPackLog::LOG_ERROR, "Error while execution CPackDeb.cmake" << std::endl); retval = 0; + return retval; } cmsys::Glob gl; @@ -288,8 +290,11 @@ int cmCPackDebGenerator::PackageFiles() "Error while execution CPackDeb.cmake" << std::endl); retval = 0; } - packageFiles = files; - return createDeb(); + else + { + packageFiles = files; + return createDeb(); + } } return retval; } diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 5f314c6..c343acf 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -885,8 +885,12 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( //---------------------------------------------------------------------- bool cmCPackGenerator::ReadListFile(const char* moduleName) { + bool retval; std::string fullPath = this->MakefileMap->GetModulesFile(moduleName); - return this->MakefileMap->ReadListFile(0, fullPath.c_str()); + retval = this->MakefileMap->ReadListFile(0, fullPath.c_str()); + // include FATAL_ERROR and ERROR in the return status + retval = retval && (! cmSystemTools::GetErrorOccuredFlag()); + return retval; } //---------------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Source/CPack/cmCPackDebGenerator.cxx | 13 +++++++++---- Source/CPack/cmCPackGenerator.cxx | 6 +++++- 2 files changed, 14 insertions(+), 5 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits