ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-04-07 11:26:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #697 via VersionBot

Browse Source 
Respect the --dont-check-device-type option, fix error message
This commit is contained in:
resin-io-versionbot[bot] 2017-10-24 14:59:21 +00:00 committed by GitHub
commit 563628a5a9
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -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]

4
build/actions/preload.js
View File

@ -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) {

4
lib/actions/preload.coffee
View File

@ -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

2
package.json
View File

@ -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",