[Cmake-commits] [cmake-commits] hoffman committed cmCPackOSXX11Generator.cxx 1.7 1.8

[cmake-commits at cmake.org]

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

Modified Files:
	cmCPackOSXX11Generator.cxx 
Log Message:
Try to avoid cronic random failures on some Macs.


Index: cmCPackOSXX11Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackOSXX11Generator.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** cmCPackOSXX11Generator.cxx	28 Sep 2009 15:42:50 -0000	1.7
--- cmCPackOSXX11Generator.cxx	4 Oct 2009 13:32:48 -0000	1.8
***************
*** 150,155 ****
                  "Compress disk image using command: " 
                  << dmgCmd.str().c_str() << std::endl);
!   bool res = cmSystemTools::RunSingleCommand(dmgCmd.str().c_str(), &output,
!     &retVal, 0, this->GeneratorVerbose, 0);
    if ( !res || retVal )
      {
--- 150,168 ----
                  "Compress disk image using command: " 
                  << dmgCmd.str().c_str() << std::endl);
!   // since we get random dashboard failures with this one
!   // try running it more than once
!   int numTries = 4;
!   bool res;
!   while(numTries > 0)
!     {
!     res = cmSystemTools::RunSingleCommand(dmgCmd.str().c_str(), &output,
!                                           &retVal, 0, 
!                                           this->GeneratorVerbose, 0);
!     if(res && retVal)
!       {
!       numTries = -1;
!       }
!     numTries--;
!     }
    if ( !res || retVal )
      {