From d003cfea25c276904dbe1e972c0cf71d5c25e689 Mon Sep 17 00:00:00 2001 From: unclejack Date: Wed, 8 Jan 2014 00:54:42 +0200 Subject: [PATCH] Revert "Add -S option to tar for efficient sparse file handling" This reverts commit 733bf5d3ddbfb6dba7c2c0996c4af47a765e4593. This is needed to fix "no such file" errors `docker build` errors for devicemapper. This fixes issue #3449. Docker-DCO-1.0-Signed-off-by: Cristian Staretu (github: unclejack) --- AUTHORS | 1 - archive/archive.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index f9e9ecdace..1ff9b8db02 100644 --- a/AUTHORS +++ b/AUTHORS @@ -48,7 +48,6 @@ Daniel YC Lin Darren Coxall David Calavera David Sissitka -Dinesh Subhraveti Deni Bertovic Dominik Honnef Don Spaulding diff --git a/archive/archive.go b/archive/archive.go index 1b8076543f..4dd5f006ef 100644 --- a/archive/archive.go +++ b/archive/archive.go @@ -149,7 +149,7 @@ func escapeName(name string) string { // Tar creates an archive from the directory at `path`, only including files whose relative // paths are included in `filter`. If `filter` is nil, then all files are included. func TarFilter(path string, options *TarOptions) (io.Reader, error) { - args := []string{"tar", "-S", "--numeric-owner", "-f", "-", "-C", path, "-T", "-"} + args := []string{"tar", "--numeric-owner", "-f", "-", "-C", path, "-T", "-"} if options.Includes == nil { options.Includes = []string{"."} } @@ -228,7 +228,7 @@ func Untar(archive io.Reader, path string, options *TarOptions) error { compression := DetectCompression(buf) utils.Debugf("Archive compression detected: %s", compression.Extension()) - args := []string{"-S", "--numeric-owner", "-f", "-", "-C", path, "-x" + compression.Flag()} + args := []string{"--numeric-owner", "-f", "-", "-C", path, "-x" + compression.Flag()} if options != nil { for _, exclude := range options.Excludes {