From a5142f6ac31c6c21b96c6895fff525c46e8056a6 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Wed, 15 Jul 2015 12:25:50 -0700 Subject: [PATCH] Fix some formatting calls Signed-off-by: Alexander Morozov --- daemon/graphdriver/devmapper/deviceset.go | 2 +- graph/load.go | 8 ++++---- pkg/archive/archive.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index cd0e005302..1db971e54d 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -1550,7 +1550,7 @@ func (devices *DeviceSet) cancelDeferredRemoval(info *DevInfo) error { } 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()) diff --git a/graph/load.go b/graph/load.go index 3a4a2746fc..c835519612 100644 --- a/graph/load.go +++ b/graph/load.go @@ -89,22 +89,22 @@ func (s *TagStore) recursiveLoad(address, tmpImageDir string) error { imageJson, err := ioutil.ReadFile(filepath.Join(tmpImageDir, "repo", address, "json")) if err != nil { - logrus.Debugf("Error reading json", err) + logrus.Debugf("Error reading json: %v", err) return err } layer, err := os.Open(filepath.Join(tmpImageDir, "repo", address, "layer.tar")) if err != nil { - logrus.Debugf("Error reading embedded tar", err) + logrus.Debugf("Error reading embedded tar: %v", err) return err } img, err := NewImgJSON(imageJson) if err != nil { - logrus.Debugf("Error unmarshalling json", err) + logrus.Debugf("Error unmarshalling json: %v", err) return err } if err := image.ValidateID(img.ID); err != nil { - logrus.Debugf("Error validating ID: %s", err) + logrus.Debugf("Error validating ID: %v", err) return err } diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go index 2722c99cb5..9cd245cf91 100644 --- a/pkg/archive/archive.go +++ b/pkg/archive/archive.go @@ -435,7 +435,7 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error) if include != relFilePath { skip, err = fileutils.OptimizedMatches(relFilePath, patterns, patDirs) if err != nil { - logrus.Debugf("Error matching %s", relFilePath, err) + logrus.Debugf("Error matching %s: %v", relFilePath, err) return err } }