toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

another commit to do like @crosbymichael

Browse Source 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: a0392324f194f4f92e3205f0c0ed8b71dc2fc93f
Component: engine
This commit is contained in:
Victor Vieux
2014-08-14 01:36:26 +00:00
parent 0bb709c134
commit 9df494bb71
11 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/archive/archive.go
+6 -6
View File
@@ -342,7 +342,7 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error)
for _, include := range options.Includes {
filepath.Walk(filepath.Join(srcPath, include), func(filePath string, f os.FileInfo, err error) error {
if err != nil {
log.Debugf("Tar: Can't stat file %s to tar: %s\n", srcPath, err)
log.Debugf("Tar: Can't stat file %s to tar: %s", srcPath, err)
return nil
}
@@ -353,7 +353,7 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error)
skip, err := utils.Matches(relFilePath, options.Excludes)
if err != nil {
log.Debugf("Error matching %s\n", relFilePath, err)
log.Debugf("Error matching %s", relFilePath, err)
return err
}
@@ -365,7 +365,7 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error)
}
if err := addTarFile(filePath, relFilePath, tw, twBuf); err != nil {
log.Debugf("Can't add file %s to tar: %s\n", srcPath, err)
log.Debugf("Can't add file %s to tar: %s", srcPath, err)
}
return nil
})
@@ -373,13 +373,13 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error)
// Make sure to check the error on Close.
if err := tw.Close(); err != nil {
log.Debugf("Can't close tar writer: %s\n", err)
log.Debugf("Can't close tar writer: %s", err)
}
if err := compressWriter.Close(); err != nil {
log.Debugf("Can't close compress writer: %s\n", err)
log.Debugf("Can't close compress writer: %s", err)
}
if err := pipeWriter.Close(); err != nil {
log.Debugf("Can't close pipe writer: %s\n", err)
log.Debugf("Can't close pipe writer: %s", err)
}
}()
components/engine/archive/changes.go
+3 -3
View File
@@ -364,19 +364,19 @@ func ExportChanges(dir string, changes []Change) (Archive, error) {
ChangeTime: timestamp,
}
if err := tw.WriteHeader(hdr); err != nil {
log.Debugf("Can't write whiteout header: %s\n", err)
log.Debugf("Can't write whiteout header: %s", err)
}
} else {
path := filepath.Join(dir, change.Path)
if err := addTarFile(path, change.Path[1:], tw, twBuf); err != nil {
log.Debugf("Can't add file %s to tar: %s\n", path, err)
log.Debugf("Can't add file %s to tar: %s", path, err)
}
}
}
// Make sure to check the error on Close.
if err := tw.Close(); err != nil {
log.Debugf("Can't close layer: %s\n", err)
log.Debugf("Can't close layer: %s", err)
}
writer.Close()
}()