From 26753e64711ac558169363b707779c97e79ac5ff Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Wed, 3 Apr 2024 01:38:45 +0200 Subject: [PATCH] override `pkg` after applying --- packages/core/src/handlers/apply.js | 2 ++ packages/core/src/handlers/install.js | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/core/src/handlers/apply.js b/packages/core/src/handlers/apply.js index 1270b84..7254e03 100644 --- a/packages/core/src/handlers/apply.js +++ b/packages/core/src/handlers/apply.js @@ -59,6 +59,8 @@ export default async function apply(pkg_id, changes = {}) { await patches.remove(findPatch(manifest.patches, pkg.applied_patches, changes, false)) await patches.patch(findPatch(manifest.patches, pkg.applied_patches, changes, true)) + + pkg = await DB.getPackages(pkg_id) } if (changes.config) { diff --git a/packages/core/src/handlers/install.js b/packages/core/src/handlers/install.js index e94274c..0ff7489 100644 --- a/packages/core/src/handlers/install.js +++ b/packages/core/src/handlers/install.js @@ -42,7 +42,7 @@ export default async function install(manifest) { Log.info(`Appending to db...`) - const pkg = DB.defaultPackageState({ + let pkg = DB.defaultPackageState({ ...manifest.constructor, id: id, name: manifest.constructor.pkg_name, @@ -140,7 +140,7 @@ export default async function install(manifest) { status_text: `Applying default patches...`, }) - await Apply(id, { + pkg = await Apply(id, { patches: Object.fromEntries(defaultPatches.map((patch) => [patch.id, true])), }) }