Skip to content

Commit d003cfe

Browse files
committedJan 8, 2014
Revert "Add -S option to tar for efficient sparse file handling"
This reverts commit 733bf5d. This is needed to fix "no such file" errors `docker build` errors for devicemapper. This fixes issue moby#3449. Docker-DCO-1.0-Signed-off-by: Cristian Staretu <[email protected]> (github: unclejack)
1 parent 45ecdf9 commit d003cfe

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed
 

‎AUTHORS

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ Daniel YC Lin <dlin.tw@gmail.com>
4848
Darren Coxall <darren@darrencoxall.com>
4949
David Calavera <david.calavera@gmail.com>
5050
David Sissitka <me@dsissitka.com>
51-
Dinesh Subhraveti <dineshs@altiscale.com>
5251
Deni Bertovic <deni@kset.org>
5352
Dominik Honnef <dominik@honnef.co>
5453
Don Spaulding <donspauldingii@gmail.com>

‎archive/archive.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func escapeName(name string) string {
149149
// Tar creates an archive from the directory at `path`, only including files whose relative
150150
// paths are included in `filter`. If `filter` is nil, then all files are included.
151151
func TarFilter(path string, options *TarOptions) (io.Reader, error) {
152-
args := []string{"tar", "-S", "--numeric-owner", "-f", "-", "-C", path, "-T", "-"}
152+
args := []string{"tar", "--numeric-owner", "-f", "-", "-C", path, "-T", "-"}
153153
if options.Includes == nil {
154154
options.Includes = []string{"."}
155155
}
@@ -228,7 +228,7 @@ func Untar(archive io.Reader, path string, options *TarOptions) error {
228228
compression := DetectCompression(buf)
229229

230230
utils.Debugf("Archive compression detected: %s", compression.Extension())
231-
args := []string{"-S", "--numeric-owner", "-f", "-", "-C", path, "-x" + compression.Flag()}
231+
args := []string{"--numeric-owner", "-f", "-", "-C", path, "-x" + compression.Flag()}
232232

233233
if options != nil {
234234
for _, exclude := range options.Excludes {

0 commit comments

Comments
 (0)
Please sign in to comment.