From 40041cd7274cb32128b12fd32deb2d032a1d90b6 Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Tue, 27 Jun 2017 15:56:12 +0200 Subject: [PATCH] chore(Xapi): import pCatch directly from promise-toolbox --- src/utils.js | 1 - src/xapi/index.js | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/utils.js b/src/utils.js index aa40b6933..bd77d4bc6 100644 --- a/src/utils.js +++ b/src/utils.js @@ -367,7 +367,6 @@ export function pSettle (promises) { export { all as pAll, - catchPlus as pCatch, delay as pDelay, fromCallback as pFromCallback, isPromise, diff --git a/src/xapi/index.js b/src/xapi/index.js index 7dc91f092..31a957884 100644 --- a/src/xapi/index.js +++ b/src/xapi/index.js @@ -4,7 +4,7 @@ import fatfs from 'fatfs' import synchronized from 'decorator-synchronized' import tarStream from 'tar-stream' 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 { forbiddenOperation } from 'xo-common/api-errors' import { @@ -38,7 +38,6 @@ import { map, mapToArray, pAll, - pCatch, pDelay, pFinally, promisifyAll,