Merge branch 'stable'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server",
-  "version": "5.15.2",
+  "version": "5.15.5",
   "license": "AGPL-3.0",
   "description": "Server part of Xen-Orchestra",
   "keywords": [

src/xapi/index.js

@@ -545,7 +545,6 @@ export default class Xapi extends XapiBase {
       await targetXapi._importVm(
         stream,
         sr,
-        false,
         onVmCreation
       )
     )

src/xapi/mixins/patching.js

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

yarn.lock

@@ -4198,7 +4198,11 @@ ltgt@~2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.1.3.tgz#10851a06d9964b971178441c23c9e52698eece34"
 
-make-error@^1, make-error@^1.0.2, make-error@^1.2.1, make-error@^1.2.3, make-error@^1.3.0:
+make-error@^1, make-error@^1.0.2, make-error@^1.2.1, make-error@^1.2.3:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96"
+
+make-error@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.2.tgz#8762ffad2444dd8ff1f7c819629fa28e24fea1c4"