beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #26412 from YuPengZTE/devERR

Browse source 
In error, the first letter is low-case letter
This commit is contained in:
Sebastiaan van Stijn 2016-09-23 14:32:27 +02:00 committed by GitHub
commit bc22318e12
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
distribution/pull_v2.go
View file

@ -832,7 +832,7 @@ func fixManifestLayers(m *schema1.Manifest) error {
if imgs[len(imgs)-1].Parent != "" && runtime.GOOS != "windows" {
// Windows base layer can point to a base layer parent that is not in manifest.
return errors.New("Invalid parent ID in the base layer of the image.")
return errors.New("invalid parent ID in the base layer of the image")
}
// check general duplicates to error instead of a deadlock

2
distribution/pull_v2_test.go
View file

@ -80,7 +80,7 @@ func TestFixManifestLayersBaseLayerParent(t *testing.T) {
},
}
if err := fixManifestLayers(&duplicateLayerManifest); err == nil || !strings.Contains(err.Error(), "Invalid parent ID in the base layer of the image.") {
if err := fixManifestLayers(&duplicateLayerManifest); err == nil || !strings.Contains(err.Error(), "invalid parent ID in the base layer of the image") {
t.Fatalf("expected an invalid parent ID error from fixManifestLayers")
}
}