BUG: patch from Mathieu: the md5sums were not correct
Alex
This commit is contained in:
parent
a442e0e0cb
commit
4040f5f1bf
@ -108,6 +108,8 @@ int cmCPackDebGenerator::CompressFiles(const char* outFileName,
|
|||||||
{ // the scope is needed for cmGeneratedFileStream
|
{ // the scope is needed for cmGeneratedFileStream
|
||||||
cmGeneratedFileStream out(md5filename.c_str());
|
cmGeneratedFileStream out(md5filename.c_str());
|
||||||
std::vector<std::string>::const_iterator fileIt;
|
std::vector<std::string>::const_iterator fileIt;
|
||||||
|
std::string topLevelWithTrailingSlash = toplevel;
|
||||||
|
topLevelWithTrailingSlash += '/';
|
||||||
for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
|
for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
|
||||||
{
|
{
|
||||||
cmd = cmakeExecutable;
|
cmd = cmakeExecutable;
|
||||||
@ -117,6 +119,11 @@ int cmCPackDebGenerator::CompressFiles(const char* outFileName,
|
|||||||
//int retVal = -1;
|
//int retVal = -1;
|
||||||
res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output,
|
res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output,
|
||||||
&retVal, toplevel, this->GeneratorVerbose, 0);
|
&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 << output;
|
||||||
}
|
}
|
||||||
out << std::endl;
|
out << std::endl;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user