[cmake-commits] alex committed cmCPackDebGenerator.cxx 1.5 1.6

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv24293

Modified Files:
	cmCPackDebGenerator.cxx 
Log Message:

BUG: patch from Mathieu: the md5sums were not correct 

Alex


Index: cmCPackDebGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackDebGenerator.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cmCPackDebGenerator.cxx	27 Jul 2007 17:12:36 -0000	1.5
+++ cmCPackDebGenerator.cxx	6 Aug 2007 13:03:10 -0000	1.6
@@ -108,6 +108,8 @@
     { // the scope is needed for cmGeneratedFileStream
     cmGeneratedFileStream out(md5filename.c_str());
     std::vector<std::string>::const_iterator fileIt;
+    std::string topLevelWithTrailingSlash = toplevel;
+    topLevelWithTrailingSlash += '/';
     for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
       {
       cmd = cmakeExecutable;
@@ -117,6 +119,11 @@
       //int retVal = -1;
       res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output,
         &retVal, toplevel, this->GeneratorVerbose, 0);
+      // debian md5sums entries are like this:
+      // 014f3604694729f3bf19263bac599765  usr/bin/ccmake
+      // thus strip the full path (with the trailing slash)
+      cmSystemTools::ReplaceString(output, 
+                                   topLevelWithTrailingSlash.c_str(), "");
       out << output;
       }
     out << std::endl;