Use GNU tar format instead of UStar for copy

This enables copying from sources containing long file names (more than 100 characters)
ocurrent · Oct 20, 2021 · 76d6b00 · 76d6b00
1 parent eebec47
commit 76d6b00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,8 @@
 ### unreleased
 
+- Use GNU tar format instead of UStar for `copy` operations (@TheLortex ...).
+  This enables copying from sources containing long file names (>100 characters).
+
 - Add support for secrets (@TheLortex #63, reviewed by @talex5).
   The obuilder spec's `run` command supports a new `secrets` fields, which allows to temporarily
   mount secret files in an user-specified location. The sandbox build context has an additional

diff --git a/lib/tar_transfer.ml b/lib/tar_transfer.ml
@@ -33,7 +33,7 @@ module Tar_lwt_unix = struct
   module HW = Tar.HeaderWriter(Lwt)(Writer)
 
   let write_block (header: Tar.Header.t) (body: Lwt_unix.file_descr -> unit Lwt.t) (fd : Lwt_unix.file_descr) =
-    HW.write ~level:Tar.Header.Ustar header fd
+    HW.write ~level:Tar.Header.GNU header fd
     >>= fun () ->
     body fd >>= fun () ->
     Writer.really_write fd (Tar.Header.zero_padding header)