[cmake-commits] alex committed cmCPackGenericGenerator.cxx 1.46 1.47 cpack.cxx 1.34 1.35

[cmake-commits at cmake.org]

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

Modified Files:
	cmCPackGenericGenerator.cxx cpack.cxx 
Log Message:

ENH: better error messages from the debian package generator
-don't display the cpack help if a generator failed with some problem
-check for cmSystemTools::GetErrorOccuredFlag()

Alex


Index: cmCPackGenericGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenericGenerator.cxx,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- cmCPackGenericGenerator.cxx	24 Jul 2007 16:52:37 -0000	1.46
+++ cmCPackGenericGenerator.cxx	3 Aug 2007 19:26:30 -0000	1.47
@@ -653,7 +653,7 @@
     tempDirectory = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
     }
   if ( !this->CompressFiles(tempPackageFileName,
-      tempDirectory, gl.GetFiles()) )
+      tempDirectory, gl.GetFiles()) || cmSystemTools::GetErrorOccuredFlag())
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem compressing the directory"
       << std::endl);
@@ -695,7 +695,13 @@
       "Cannot initialize the generator" << std::endl);
     return 0;
     }
-  return this->InitializeInternal();
+  int result = this->InitializeInternal();
+  if (cmSystemTools::GetErrorOccuredFlag())
+    {
+    return 0;
+    }
+
+  return result;
 }
 
 //----------------------------------------------------------------------

Index: cpack.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cpack.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- cpack.cxx	27 Jul 2007 14:55:24 -0000	1.34
+++ cpack.cxx	3 Aug 2007 19:26:30 -0000	1.35
@@ -377,13 +377,13 @@
             {
             cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
               "Cannot initialize CPack generator: "
-              << generator.c_str() << std::endl);
+              << gen << std::endl);
             parsed = 0;
             }
           if ( parsed && !cpackGenerator->Initialize(gen, mf, argv[0]) )
             {
             cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
-              "Cannot initialize the generator" << std::endl);
+              "Cannot initialize the generator " << gen << std::endl);
             parsed = 0;
             }
 
@@ -442,7 +442,7 @@
       }
     }
 
-  if ( !parsed || help )
+  if ( help )
     {
     doc.CheckOptions(argc, argv);
     // Construct and print requested documentation.