Merge pull request moby#14661 from LK4D4/vet_warns

Fix some formatting calls
sjhx · Jul 15, 2015 · cd64297 · cd64297
2 parents a81dcae + a5142f6
commit cd64297
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -86,22 +86,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
@@ -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
 					}
 				}