Browse code

Merge pull request #14661 from LK4D4/vet_warns

Fix some formatting calls

David Calavera authored on 2015/07/16 08:41:18
Showing 3 changed files
... ...
@@ -1550,7 +1550,7 @@ func (devices *DeviceSet) cancelDeferredRemoval(info *DevInfo) error {
1550 1550
 	}
1551 1551
 
1552 1552
 	logrus.Debugf("[devmapper] cancelDeferredRemoval START(%s)", info.Name())
1553
-	defer logrus.Debugf("[devmapper] cancelDeferredRemoval END(%s)", info.Name)
1553
+	defer logrus.Debugf("[devmapper] cancelDeferredRemoval END(%s)", info.Name())
1554 1554
 
1555 1555
 	devinfo, err := devicemapper.GetInfoWithDeferred(info.Name())
1556 1556
 
... ...
@@ -86,22 +86,22 @@ func (s *TagStore) recursiveLoad(address, tmpImageDir string) error {
86 86
 
87 87
 		imageJson, err := ioutil.ReadFile(filepath.Join(tmpImageDir, "repo", address, "json"))
88 88
 		if err != nil {
89
-			logrus.Debugf("Error reading json", err)
89
+			logrus.Debugf("Error reading json: %v", err)
90 90
 			return err
91 91
 		}
92 92
 
93 93
 		layer, err := os.Open(filepath.Join(tmpImageDir, "repo", address, "layer.tar"))
94 94
 		if err != nil {
95
-			logrus.Debugf("Error reading embedded tar", err)
95
+			logrus.Debugf("Error reading embedded tar: %v", err)
96 96
 			return err
97 97
 		}
98 98
 		img, err := NewImgJSON(imageJson)
99 99
 		if err != nil {
100
-			logrus.Debugf("Error unmarshalling json", err)
100
+			logrus.Debugf("Error unmarshalling json: %v", err)
101 101
 			return err
102 102
 		}
103 103
 		if err := image.ValidateID(img.ID); err != nil {
104
-			logrus.Debugf("Error validating ID: %s", err)
104
+			logrus.Debugf("Error validating ID: %v", err)
105 105
 			return err
106 106
 		}
107 107
 
... ...
@@ -435,7 +435,7 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error)
435 435
 				if include != relFilePath {
436 436
 					skip, err = fileutils.OptimizedMatches(relFilePath, patterns, patDirs)
437 437
 					if err != nil {
438
-						logrus.Debugf("Error matching %s", relFilePath, err)
438
+						logrus.Debugf("Error matching %s: %v", relFilePath, err)
439 439
 						return err
440 440
 					}
441 441
 				}