From 6380eab9770b3be27b845c89512a5cd5a16fa1ea Mon Sep 17 00:00:00 2001
From: spiralvoice <spiralvoice>
Date: Sun, 19 Dec 2010 10:10:24 +0000
Subject: [PATCH] patch #7412

---
 distrib/ChangeLog                         |  1 +
 src/daemon/common/commonComplexOptions.ml |  5 -----
 src/utils/cdk/tar.mlcpp                   | 11 +----------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/distrib/ChangeLog b/distrib/ChangeLog
index c3792bcd..cce86c82 100644
--- a/distrib/ChangeLog
+++ b/distrib/ChangeLog
@@ -15,6 +15,7 @@ ChangeLog
 =========
 
 2010/12/19
+7412: tar.gzip: fix harmless error message (ygrek)
 7388: DC: fix sharing on Windows (ygrek)
 -------------------------------------------------------------------------------
 2010/11/15: version 3.0.6 = tag release-3-0-6
diff --git a/src/daemon/common/commonComplexOptions.ml b/src/daemon/common/commonComplexOptions.ml
index 12988ddb..953ff346 100644
--- a/src/daemon/common/commonComplexOptions.ml
+++ b/src/daemon/common/commonComplexOptions.ml
@@ -1163,11 +1163,6 @@ let backup_tar archive files =
 	    header, s) in
 	Tar.output otar header s
       with
-      | (Gzip.Error "error during compression") as e when Autoconf.windows && arg = "fasttrack.ini" ->
-	  (* for whatever reason this error is raised on Windows,
-             but fasttrack.ini is stored correctly *)
-	  if !verbose then
-            lprintf_nl "Tar: Windows specific pseudo error %s in %s" (Printexc2.to_string e) arg
       | e ->
 	  failed_files := arg :: !failed_files;
 	  lprintf_nl "Tar: skipping %s, error %s" arg (Printexc2.to_string e)
diff --git a/src/utils/cdk/tar.mlcpp b/src/utils/cdk/tar.mlcpp
index d254afab..cad3c702 100644
--- a/src/utils/cdk/tar.mlcpp
+++ b/src/utils/cdk/tar.mlcpp
@@ -416,16 +416,7 @@ let output t head body =
 	  t.ochan#output buf2 0 blocksize
       end;
       if size > 0 then begin
-	let blocks = size / blocksize in
-	  for n = 0 to blocks do
-	    let pos = n * blocksize in
-	    let len =
-	      if size - pos >= blocksize then
-		blocksize
-	      else
-		size - pos in
-	      t.ochan#output body (n * 512) len;
-	  done;	 
+    t.ochan#output body 0 size;
 	  let align = blocksize - (size mod blocksize) in
 	    if align > 0 && align < blocksize then 
 	      t.ochan#output empty_block 0 align
-- 
2.11.4.GIT