kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix some formatting calls

Browse source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov 2015-07-15 12:25:50 -07:00
parent 46aea60fb0
commit a5142f6ac3
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/graphdriver/devmapper/deviceset.go
View file

@ -1550,7 +1550,7 @@ func (devices *DeviceSet) cancelDeferredRemoval(info *DevInfo) error {
} }
logrus.Debugf("[devmapper] cancelDeferredRemoval START(%s)", info.Name()) logrus.Debugf("[devmapper] cancelDeferredRemoval START(%s)", info.Name())
defer logrus.Debugf("[devmapper] cancelDeferredRemoval END(%s)", info.Name) defer logrus.Debugf("[devmapper] cancelDeferredRemoval END(%s)", info.Name())
devinfo, err := devicemapper.GetInfoWithDeferred(info.Name()) devinfo, err := devicemapper.GetInfoWithDeferred(info.Name())

8
graph/load.go
View file

@ -89,22 +89,22 @@ func (s *TagStore) recursiveLoad(address, tmpImageDir string) error {
imageJson, err := ioutil.ReadFile(filepath.Join(tmpImageDir, "repo", address, "json")) imageJson, err := ioutil.ReadFile(filepath.Join(tmpImageDir, "repo", address, "json"))
if err != nil { if err != nil {
logrus.Debugf("Error reading json", err) logrus.Debugf("Error reading json: %v", err)
return err return err
} }
layer, err := os.Open(filepath.Join(tmpImageDir, "repo", address, "layer.tar")) layer, err := os.Open(filepath.Join(tmpImageDir, "repo", address, "layer.tar"))
if err != nil { if err != nil {
logrus.Debugf("Error reading embedded tar", err) logrus.Debugf("Error reading embedded tar: %v", err)
return err return err
} }
img, err := NewImgJSON(imageJson) img, err := NewImgJSON(imageJson)
if err != nil { if err != nil {
logrus.Debugf("Error unmarshalling json", err) logrus.Debugf("Error unmarshalling json: %v", err)
return err return err
} }
if err := image.ValidateID(img.ID); err != nil { if err := image.ValidateID(img.ID); err != nil {
logrus.Debugf("Error validating ID: %s", err) logrus.Debugf("Error validating ID: %v", err)
return err return err
} }

2
pkg/archive/archive.go
View file

@ -435,7 +435,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", relFilePath, err) logrus.Debugf("Error matching %s: %v", relFilePath, err)
return err return err
} }
} }