kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #20492 from WeiZhang555/export-no-privilege 

Clean redundant error message for export
This commit is contained in:
Vincent Demeester 2016-02-29 21:14:28 +01:00
parent 9eb4575f8c 439433099e
commit d878f512fd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/archive/archive.go
View File

@ -502,13 +502,13 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error)
defer func() { defer func() {
// Make sure to check the error on Close. // Make sure to check the error on Close.
if err := ta.TarWriter.Close(); err != nil { if err := ta.TarWriter.Close(); err != nil {
logrus.Debugf("Can't close tar writer: %s", err) logrus.Errorf("Can't close tar writer: %s", err)
} }
if err := compressWriter.Close(); err != nil { if err := compressWriter.Close(); err != nil {
logrus.Debugf("Can't close compress writer: %s", err) logrus.Errorf("Can't close compress writer: %s", err)
} }
if err := pipeWriter.Close(); err != nil { if err := pipeWriter.Close(); err != nil {
logrus.Debugf("Can't close pipe writer: %s", err) logrus.Errorf("Can't close pipe writer: %s", err)
} }
}() }()
@ -551,7 +551,7 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error)
walkRoot := getWalkRoot(srcPath, include) walkRoot := getWalkRoot(srcPath, include)
filepath.Walk(walkRoot, func(filePath string, f os.FileInfo, err error) error { filepath.Walk(walkRoot, func(filePath string, f os.FileInfo, err error) error {
if err != nil { if err != nil {
logrus.Debugf("Tar: Can't stat file %s to tar: %s", srcPath, err) logrus.Errorf("Tar: Can't stat file %s to tar: %s", srcPath, err)
return nil return nil
} }
@ -576,7 +576,7 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error)
if include != relFilePath { if include != relFilePath {
skip, err = fileutils.OptimizedMatches(relFilePath, patterns, patDirs) skip, err = fileutils.OptimizedMatches(relFilePath, patterns, patDirs)
if err != nil { if err != nil {
logrus.Debugf("Error matching %s: %v", relFilePath, err) logrus.Errorf("Error matching %s: %v", relFilePath, err)
return err return err
} }
} }
@ -607,7 +607,11 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error)
} }
if err := ta.addTarFile(filePath, relFilePath); err != nil { if err := ta.addTarFile(filePath, relFilePath); err != nil {
logrus.Debugf("Can't add file %s to tar: %s", filePath, err) logrus.Errorf("Can't add file %s to tar: %s", filePath, err)
// if pipe is broken, stop writting tar stream to it
if err == io.ErrClosedPipe {
return err
}
} }
return nil return nil
}) })