NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(Xapi): import pCatch directly from promise-toolbox

Browse Source
This commit is contained in:
Julien Fontanet 2017-06-27 15:56:12 +02:00
parent cfc6374995
commit 40041cd727
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/utils.js
View File

@ -367,7 +367,6 @@ export function pSettle (promises) {
export { export {
all as pAll, all as pAll,
catchPlus as pCatch,
delay as pDelay, delay as pDelay,
fromCallback as pFromCallback, fromCallback as pFromCallback,
isPromise, isPromise,

3
src/xapi/index.js
View File

@ -4,7 +4,7 @@ import fatfs from 'fatfs'
import synchronized from 'decorator-synchronized' import synchronized from 'decorator-synchronized'
import tarStream from 'tar-stream' import tarStream from 'tar-stream'
import vmdkToVhd from 'xo-vmdk-to-vhd' import vmdkToVhd from 'xo-vmdk-to-vhd'
import { cancellable, defer, ignoreErrors } from 'promise-toolbox' import { cancellable, catchPlus as pCatch, defer, ignoreErrors } from 'promise-toolbox'
import { PassThrough } from 'stream' import { PassThrough } from 'stream'
import { forbiddenOperation } from 'xo-common/api-errors' import { forbiddenOperation } from 'xo-common/api-errors'
import { import {
@ -38,7 +38,6 @@ import {
map, map,
mapToArray, mapToArray,
pAll, pAll,
pCatch,
pDelay, pDelay,
pFinally, pFinally,
promisifyAll, promisifyAll,