From ca51d598154bcd5952ba873c9aef748eef511b9b Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Fri, 16 Mar 2018 16:24:45 +0100 Subject: [PATCH] chore(xo-server/chainVhd): allow parent and child to be in different dirs (#2762) --- packages/xo-server/src/vhd-merge.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/xo-server/src/vhd-merge.js b/packages/xo-server/src/vhd-merge.js index fbbfffa14..1fb2f0109 100644 --- a/packages/xo-server/src/vhd-merge.js +++ b/packages/xo-server/src/vhd-merge.js @@ -4,6 +4,7 @@ import assert from 'assert' import concurrency from 'limit-concurrency-decorator' import fu from '@nraynaud/struct-fu' import isEqual from 'lodash/isEqual' +import { dirname, relative } from 'path' import { fromEvent } from 'promise-toolbox' import type RemoteHandler from './remote-handlers/abstract' @@ -745,7 +746,7 @@ export async function chainVhd ( const { header } = childVhd - const parentName = parentPath.split('/').pop() + const parentName = relative(dirname(childPath), parentPath) const parentUuid = parentVhd.footer.uuid if ( header.parentUnicodeName !== parentName ||