[Cmake-commits] [cmake-commits] hoffman committed QMacInstallDialog.cxx 1.4 1.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv434

Modified Files:
	QMacInstallDialog.cxx 
Log Message:
ENH: add better error checks to symlink create stuff


Index: QMacInstallDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QMacInstallDialog.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** QMacInstallDialog.cxx	4 Apr 2008 20:02:50 -0000	1.4
--- QMacInstallDialog.cxx	23 Apr 2008 13:58:18 -0000	1.5
***************
*** 70,79 ****
        {
        std::cout << "rm [" << newName << "]\n";
!       cmSystemTools::RemoveFile(newName.c_str());
        }
      std::cout << "ln -s [" << file << "] [";
      std::cout << newName << "]\n";
!     cmSystemTools::CreateSymlink(file.c_str(),
!                                  newName.c_str());
      }
    this->done(0);
--- 70,105 ----
        {
        std::cout << "rm [" << newName << "]\n";
!       if(!cmSystemTools::RemoveFile(newName.c_str()))
!         {
!         QString message = tr("Failed to remove file "
!                              "installation may be incomplete: ");
!         message += newName.c_str();
!         QString title = tr("Error Removing file");
!         QMessageBox::StandardButton btn =
!           QMessageBox::critical(this, title, message, 
!                                 QMessageBox::Ok|QMessageBox::Abort);
!         if(btn == QMessageBox::Abort)
!           {
!           return;
!           }
!         }
        }
      std::cout << "ln -s [" << file << "] [";
      std::cout << newName << "]\n";
!     if(!cmSystemTools::CreateSymlink(file.c_str(),
!                                      newName.c_str()))
!       {
!       QString message = tr("Failed create symlink "
!                            "installation may be incomplete: ");
!       message += newName.c_str();
!       QString title = tr("Error Creating Symlink");
!       QMessageBox::StandardButton btn =
!         QMessageBox::critical(this, title, message, 
!                               QMessageBox::Ok|QMessageBox::Abort);
!       if(btn == QMessageBox::Abort)
!         {
!         return;
!         }
!       }
      }
    this->done(0);