Spearhead/node-spearhead
Archived
3
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

TOOLS-1587 'triton profile docker-setup' fails when path to 'docker' has spaces

Browse Source 
Reviewed by: Julien Gilli <julien.gilli@joyent.com>
Reviewed by: Orlando Vazquez <orlando@joyent.com>
Approved by: Orlando Vazquez <orlando@joyent.com>
This commit is contained in:
Trent Mick 2016-10-26 11:11:27 -07:00
parent 0d4850405b
commit 246810e342
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/common.js
View File

@ -834,8 +834,7 @@ function execPlus(args, cb) {
+ '\tstdout:\n%s\n' + '\tstdout:\n%s\n'
+ '\tstderr:\n%s', + '\tstderr:\n%s',
cmd, err.code, stdout.trim(), stderr.trim()); cmd, err.code, stdout.trim(), stderr.trim());
cb(new errors.InternalError({message: msg, cause: err}), cb(new errors.InternalError(err, msg), stdout, stderr);
stdout, stderr);
} else { } else {
cb(null, stdout, stderr); cb(null, stdout, stderr);
} }

2
lib/do_profile/profilecommon.js
View File

@ -313,7 +313,7 @@ function profileDockerSetup(opts, cb) {
return; return;
} }
common.execPlus({ common.execPlus({
cmd: arg.dockerPath + ' --version', cmd: format('"%s" --version', arg.dockerPath),
log: log log: log
}, function (err, stdout, stderr) { }, function (err, stdout, stderr) {
if (err) { if (err) {