[Cmake-commits] CMake branch, next, updated. v2.8.9-1223-g47df2f5

[Clinton Stimpson]

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  47df2f5509e8b2326fe541ae7a24681c3a245865 (commit)
       via  a2e917f7642146bc74a232092b622da1f0c6dc65 (commit)
      from  fab4dc7c79fd72ac1d516dad6cd03dda58c52f1f (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=47df2f5509e8b2326fe541ae7a24681c3a245865
commit 47df2f5509e8b2326fe541ae7a24681c3a245865
Merge: fab4dc7 a2e917f
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Sat Oct 27 22:59:44 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 27 22:59:44 2012 -0400

    Merge topic 'packagemaker-component-postflight' into next
    
    a2e917f PackageMaker: Fix KWStyle failures from previous commit.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2e917f7642146bc74a232092b622da1f0c6dc65
commit a2e917f7642146bc74a232092b622da1f0c6dc65
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Sat Oct 27 20:59:08 2012 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Sat Oct 27 20:59:08 2012 -0600

    PackageMaker: Fix KWStyle failures from previous commit.

diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index ce3d0c9..c617a3e 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -182,11 +182,12 @@ int cmCPackPackageMakerGenerator::PackageFiles()
     if (!cmsys::SystemTools::MakeDirectory(packageFileDir.c_str()))
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR,
-                    "Problem creating component PostFlight Packages directory: "
+                   "Problem creating component PostFlight Packages directory: "
                     << packageFileDir.c_str() << std::endl);
       return 0;
       }
-    std::string packageFile = packageFileDir + this->GetPackageName(PostFlightComponent);
+    std::string packageFile = packageFileDir +
+      this->GetPackageName(PostFlightComponent);
     if (!this->GenerateComponentPackage(packageFile.c_str(),
                                         packageDir.c_str(),
                                         PostFlightComponent))
@@ -824,8 +825,8 @@ WriteDistributionFile(const char* metapackageFile)
     }
   if(!this->PostFlightComponent.Name.empty())
     {
-      choiceOut << "<line choice=\"" << PostFlightComponent.Name << "Choice\"></line>"
-                << std::endl;
+      choiceOut << "<line choice=\"" << PostFlightComponent.Name
+                << "Choice\"></line>" << std::endl;
     }
   choiceOut << "</choices-outline>" << std::endl;
 

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cmCPackPackageMakerGenerator.cxx |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake