docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sean-polish

This commit is contained in:
Sean Li 2015-02-13 11:26:43 -08:00
parent f9f2dc6191 2c587445e9
commit 99ae10ef1f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/VirtualBox.js
View File

@ -31,8 +31,8 @@ var VirtualBox = {
return util.exec(['pkill', 'VirtualBox']); return util.exec(['pkill', 'VirtualBox']);
}).then(() => { }).then(() => {
return util.exec(['pkill', 'VBox']); return util.exec(['pkill', 'VBox']);
}).catch(err => { }).catch(() => {
}); });
}, },
vmstate: function (name) { vmstate: function (name) {
@ -48,9 +48,6 @@ var VirtualBox = {
}, },
vmdestroy: function (name) { vmdestroy: function (name) {
return Promise.coroutine(function* () { return Promise.coroutine(function* () {
if (!this.installed()) {
return Promise.reject('VirtualBox not installed.');
}
try { try {
var state = yield this.vmstate(name); var state = yield this.vmstate(name);
if (state === 'running') { if (state === 'running') {