ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-02-21 09:51:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #713 via VersionBot

Browse Source 
Fix 'cannot read property R_OK of undefined' error in Node >=6 <6.3
This commit is contained in:
resin-io-versionbot[bot] 2017-11-14 10:30:30 +00:00 committed by GitHub
commit 6562eb544c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 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.8.2 - 2017-11-14
* Fix 'cannot read property R_OK of undefined' error in Node >=6 <6.3 #713 [Tim Perry]
## v6.8.1 - 2017-11-09
* Avoid AmbiguousApplication errors in device register when an id is used #711 [Tim Perry]

2
build/utils/docker.js
View File

@ -329,7 +329,7 @@ ensureDockerSeemsAccessible = function(options) {
var fs;
fs = require('mz/fs');
if (options.socketPath != null) {
return fs.access(options.socketPath, fs.constants.R_OK | fs.constants.W_OK)["return"](true)["catch"](function(err) {
return fs.access(options.socketPath, (fs.constants || fs).R_OK | (fs.constants || fs).W_OK)["return"](true)["catch"](function(err) {
throw new Error("Docker seems to be unavailable (using socket " + options.socketPath + "). Is it installed, and do you have permission to talk to it?");
});
} else {

2
lib/utils/docker.coffee
View File

@ -341,7 +341,7 @@ ensureDockerSeemsAccessible = (options) ->
if options.socketPath?
# If we're trying to use a socket, check it exists and we have access to it
fs.access(options.socketPath, fs.constants.R_OK | fs.constants.W_OK)
fs.access(options.socketPath, (fs.constants || fs).R_OK | (fs.constants || fs).W_OK)
.return(true)
.catch (err) ->
throw new Error(

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "resin-cli",
"version": "6.8.1",
"version": "6.8.2",
"description": "The official resin.io CLI tool",
"main": "./build/actions/index.js",
"homepage": "https://github.com/resin-io/resin-cli",