From 19ce4c4cdb7af7b757fdfc7a112d21a93fde24b3 Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Tue, 24 Oct 2017 16:45:36 +0200 Subject: [PATCH 1/2] Respect the -dont-check-device-type option, fix error message Connects-To: #696 Change-Type: patch --- build/actions/preload.js | 4 ++-- lib/actions/preload.coffee | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/actions/preload.js b/build/actions/preload.js index 060d9480..8c3b27e3 100644 --- a/build/actions/preload.js +++ b/build/actions/preload.js @@ -237,8 +237,8 @@ module.exports = { return selectApplication(info.device_type); }).then(function(application) { preloader.setApplication(application); - if (info.device_type !== application.device_type) { - expectedError("Image device type (" + application.device_type + ") and application device type (" + slug + ") do not match"); + if (!options['dont-check-device-type'] && info.device_type !== application.device_type) { + expectedError("Image device type (" + info.device_type + ") and application device type (" + application.device_type + ") do not match"); } return Promise["try"](function() { if (options.commit) { diff --git a/lib/actions/preload.coffee b/lib/actions/preload.coffee index 7dd91ec3..9e9dbeb2 100644 --- a/lib/actions/preload.coffee +++ b/lib/actions/preload.coffee @@ -243,9 +243,9 @@ module.exports = .then (application) -> preloader.setApplication(application) # Check that the app device type and the image device type match - if info.device_type != application.device_type + if not options['dont-check-device-type'] and info.device_type != application.device_type expectedError( - "Image device type (#{application.device_type}) and application device type (#{slug}) do not match" + "Image device type (#{info.device_type}) and application device type (#{application.device_type}) do not match" ) # Use the commit given as --commit or show an interactive commit selection menu From 385e2c7f7a28432514c59013f9924a20424e3bcc Mon Sep 17 00:00:00 2001 From: "resin-io-versionbot[bot]" Date: Tue, 24 Oct 2017 14:56:48 +0000 Subject: [PATCH 2/2] v6.7.1 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b5a9587..2e87c7bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY! This project adheres to [Semantic Versioning](http://semver.org/). +## v6.7.1 - 2017-10-24 + +* Respect the -dont-check-device-type option, fix error message #697 [Alexis Svinartchouk] + ## v6.7.0 - 2017-10-18 * Added a device api key parameter to the `os configure` command. #487 [Pagan Gazzard] diff --git a/package.json b/package.json index fd1658b8..da638961 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "resin-cli", - "version": "6.7.0", + "version": "6.7.1", "description": "The official resin.io CLI tool", "main": "./build/actions/index.js", "homepage": "https://github.com/resin-io/resin-cli",