TOOLS-1587 'triton profile docker-setup' fails when path to 'docker' has spaces
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:
parent
0d4850405b
commit
246810e342
@ -834,8 +834,7 @@ function execPlus(args, cb) {
|
||||
+ '\tstdout:\n%s\n'
|
||||
+ '\tstderr:\n%s',
|
||||
cmd, err.code, stdout.trim(), stderr.trim());
|
||||
cb(new errors.InternalError({message: msg, cause: err}),
|
||||
stdout, stderr);
|
||||
cb(new errors.InternalError(err, msg), stdout, stderr);
|
||||
} else {
|
||||
cb(null, stdout, stderr);
|
||||
}
|
||||
|
@ -313,7 +313,7 @@ function profileDockerSetup(opts, cb) {
|
||||
return;
|
||||
}
|
||||
common.execPlus({
|
||||
cmd: arg.dockerPath + ' --version',
|
||||
cmd: format('"%s" --version', arg.dockerPath),
|
||||
log: log
|
||||
}, function (err, stdout, stderr) {
|
||||
if (err) {
|
||||
|
Reference in New Issue
Block a user