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

chore(xo-server/chainVhd): allow parent and child to be in different dirs (#2762)

Browse Source
This commit is contained in:
Julien Fontanet 2018-03-16 16:24:45 +01:00 committed by GitHub
parent 433f445e99
commit ca51d59815
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/xo-server/src/vhd-merge.js
View File

@ -4,6 +4,7 @@ import assert from 'assert'
import concurrency from 'limit-concurrency-decorator' import concurrency from 'limit-concurrency-decorator'
import fu from '@nraynaud/struct-fu' import fu from '@nraynaud/struct-fu'
import isEqual from 'lodash/isEqual' import isEqual from 'lodash/isEqual'
import { dirname, relative } from 'path'
import { fromEvent } from 'promise-toolbox' import { fromEvent } from 'promise-toolbox'
import type RemoteHandler from './remote-handlers/abstract' import type RemoteHandler from './remote-handlers/abstract'
@ -745,7 +746,7 @@ export async function chainVhd (
const { header } = childVhd const { header } = childVhd
const parentName = parentPath.split('/').pop() const parentName = relative(dirname(childPath), parentPath)
const parentUuid = parentVhd.footer.uuid const parentUuid = parentVhd.footer.uuid
if ( if (
header.parentUnicodeName !== parentName || header.parentUnicodeName !== parentName ||