[cmake-commits] hoffman committed cmCPackTGZGenerator.cxx 1.13.2.4 1.13.2.5 cmCPackTarCompressGenerator.cxx 1.3.2.6 1.3.2.7

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	cmCPackTGZGenerator.cxx cmCPackTarCompressGenerator.cxx 
Log Message:
ENH: move changes from head


Index: cmCPackTGZGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTGZGenerator.cxx,v
retrieving revision 1.13.2.4
retrieving revision 1.13.2.5
diff -u -d -r1.13.2.4 -r1.13.2.5
--- cmCPackTGZGenerator.cxx	25 Oct 2007 18:03:49 -0000	1.13.2.4
+++ cmCPackTGZGenerator.cxx	27 Oct 2007 02:57:00 -0000	1.13.2.5
@@ -231,7 +231,7 @@
   int options = 0;
   if(this->GeneratorVerbose)
     {
-    options != TAR_VERBOSE;
+    options |= TAR_VERBOSE;
     }
 #ifdef __CYGWIN__
   options |= TAR_GNU;

Index: cmCPackTarCompressGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTarCompressGenerator.cxx,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -u -d -r1.3.2.6 -r1.3.2.7
--- cmCPackTarCompressGenerator.cxx	25 Oct 2007 18:03:49 -0000	1.3.2.6
+++ cmCPackTarCompressGenerator.cxx	27 Oct 2007 02:57:00 -0000	1.3.2.7
@@ -178,7 +178,7 @@
   int options = 0;
   if(this->GeneratorVerbose)
     {
-    options != TAR_VERBOSE;
+    options |= TAR_VERBOSE;
     }
 #ifdef __CYGWIN__
   options |= TAR_GNU;