installer: improve incompatible image error message

Include image device types and own device type in an error thrown when image is incompatible with the device. Changelog: title Signed-off-by: Maciej Borzecki <[email protected]> (cherry picked from commit 496099b)
mendersoftware · Aug 18, 2017 · 64e0a00 · 64e0a00
1 parent 1128c3c
commit 64e0a00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/installer/installer.go b/installer/installer.go
@@ -68,7 +68,8 @@ func Install(art io.ReadCloser, dt string, key []byte, device UInstaller) error
 				return nil
 			}
 		}
-		return errors.New("installer: image not compatible with device")
+		return errors.Errorf("installer: image (device types %v) not compatible with device %v",
+			devices, dt)
 	}
 
 	// VerifySignatureCallback needs to be registered both for

diff --git a/installer/installer_test.go b/installer/installer_test.go
@@ -37,7 +37,7 @@ func TestInstall(t *testing.T) {
 	err = Install(art, "fake-device", nil, nil)
 	assert.Error(t, err)
 	assert.Contains(t, errors.Cause(err).Error(),
-		"image not compatible with device")
+		"not compatible with device fake-device")
 
 	art, err = MakeRootfsImageArtifact(1, false)
 	assert.NoError(t, err)
@@ -62,7 +62,7 @@ func TestInstallSigned(t *testing.T) {
 	err = Install(art, "fake-device", []byte(PublicRSAKey), new(fDevice))
 	assert.Error(t, err)
 	assert.Contains(t, errors.Cause(err).Error(),
-		"image not compatible with device")
+		"not compatible with device fake-device")
 
 	// installation successful
 	art, err = MakeRootfsImageArtifact(2, true)