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

chore(patching/bulk): omit XS-upgrade patches (#645)

Browse Source 
Fixes vatesfr/xo-web#2564
This commit is contained in:
Pierre Donias 2018-01-10 11:28:04 +01:00 committed by Julien Fontanet
parent 51504cc6a3
commit 3df01cd0cf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/xapi/mixins/patching.js
View File

@ -56,6 +56,7 @@ export default {
return patch.requiredpatch.uuid return patch.requiredpatch.uuid
}), }),
paid: patch['update-stream'] === 'premium', paid: patch['update-stream'] === 'premium',
upgrade: /^XS\d{2,}$/.test(patch['name-label']),
// TODO: what does it mean, should we handle it? // TODO: what does it mean, should we handle it?
// version: patch.version, // version: patch.version,
} }
@ -421,7 +422,7 @@ export default {
const installableByUuid = host.license_params.sku_type !== 'free' const installableByUuid = host.license_params.sku_type !== 'free'
? await this._listMissingPoolPatchesOnHost(host) ? await this._listMissingPoolPatchesOnHost(host)
: filter(await this._listMissingPoolPatchesOnHost(host), [ 'paid', false ]) : filter(await this._listMissingPoolPatchesOnHost(host), { paid: false, upgrade: false })
// List of all installable patches sorted from the newest to the // List of all installable patches sorted from the newest to the
// oldest. // oldest.
@ -451,7 +452,7 @@ export default {
if (host.$type === 'host') { if (host.$type === 'host') {
return this._listMissingPoolPatchesOnHost(host).then(patches => host.license_params.sku_type !== 'free' return this._listMissingPoolPatchesOnHost(host).then(patches => host.license_params.sku_type !== 'free'
? patches ? patches
: filter(patches, [ 'paid', false ]) : filter(patches, { paid: false, upgrade: false })
) )
} }
})) }))