From b584620cd5a9beb0aa63699f8a0ec05ffcf92dea Mon Sep 17 00:00:00 2001 From: denihs Date: Thu, 27 Apr 2023 17:14:31 -0300 Subject: [PATCH] - fix test: unknown release" --- tools/cli/main.js | 4 ++-- tools/packaging/warehouse.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/cli/main.js b/tools/cli/main.js index 7dd1f48434..1f9a95a34d 100644 --- a/tools/cli/main.js +++ b/tools/cli/main.js @@ -1037,7 +1037,7 @@ makeGlobalAsyncLocalStorage().run({}, async function () { // ATTEMPT 2: legacy release, on disk. (And it's a "real" release, not a // "red pill" release which has the same name as a modern release!) if (warehouse.realReleaseExistsInWarehouse(releaseName)) { - var manifest = warehouse.ensureReleaseExistsAndReturnManifest( + var manifest = await warehouse.ensureReleaseExistsAndReturnManifest( releaseName); await oldSpringboard(manifest.tools); // doesn't return } @@ -1062,7 +1062,7 @@ makeGlobalAsyncLocalStorage().run({}, async function () { // ATTEMPT 4: legacy release, loading from warehouse server. manifest = null; try { - manifest = warehouse.ensureReleaseExistsAndReturnManifest( + manifest = await warehouse.ensureReleaseExistsAndReturnManifest( releaseName); } catch (e) { // Note: this is WAREHOUSE's NoSuchReleaseError, not RELEASE's diff --git a/tools/packaging/warehouse.js b/tools/packaging/warehouse.js index a8e42166e2..e31ab0f7c7 100644 --- a/tools/packaging/warehouse.js +++ b/tools/packaging/warehouse.js @@ -191,7 +191,7 @@ Object.assign(warehouse, { // fetches the manifest file for the given release version. also fetches // all of the missing versioned packages referenced from the release manifest // @param releaseVersion {String} eg "0.1" - _populateWarehouseForRelease: function (releaseVersion, showInstalling) { + _populateWarehouseForRelease: async function (releaseVersion, showInstalling) { var releasesDir = files.pathJoin(warehouse.getWarehouseDir(), 'releases'); files.mkdir_p(releasesDir, 0o755); var releaseManifestPath = files.pathJoin(releasesDir, @@ -221,7 +221,7 @@ Object.assign(warehouse, { } try { - var result = httpHelpers.request( + var result = await httpHelpers.request( WAREHOUSE_URLBASE + "/releases/" + releaseVersion + ".release.json"); } catch (e) { throw new files.OfflineError(e);