From 82e58e0e69961656bfd9ca3d0eaaaeec7824191c Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@github.com>
Date: Thu, 13 Oct 2022 18:07:52 +0200
Subject: [PATCH] Debug

---
 dist/setup/index.js | 16 +++++++++-------
 src/install-pypy.ts | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index 86d83d2a..569bc161 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -66565,10 +66565,7 @@ function pypyVersionToSemantic(versionSpec) {
 }
 exports.pypyVersionToSemantic = pypyVersionToSemantic;
 function isArchPresentForWindows(item, architecture) {
-    // convert x32 to x86 cause os.arch() return x32 for 32-bit system but PyPy releases json has x86 arch value.
-    if (architecture === 'x32') {
-        architecture = 'x86';
-    }
+    architecture = ReplaceX32toX86(architecture);
     return item.files.some((file) => {
         return file.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(file.platform);
     });
@@ -66579,9 +66576,7 @@ function isArchPresentForMacOrLinux(item, architecture, platform) {
 }
 exports.isArchPresentForMacOrLinux = isArchPresentForMacOrLinux;
 function findAssetForWindows(releases, architecture) {
-    if (architecture === 'x32') {
-        architecture = 'x86';
-    }
+    architecture = ReplaceX32toX86(architecture);
     return releases.files.find((item) => {
         return item.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(item.platform);
     });
@@ -66591,6 +66586,13 @@ function findAssetForMacOrLinux(releases, architecture, platform) {
     return releases.files.find((item) => item.arch === architecture && item.platform === platform);
 }
 exports.findAssetForMacOrLinux = findAssetForMacOrLinux;
+function ReplaceX32toX86(architecture) {
+    // convert x32 to x86 because os.arch() return x32 for 32-bit systems but PyPy releases json has x86 arch value.
+    if (architecture === 'x32') {
+        architecture = 'x86';
+    }
+    return architecture;
+}
 
 
 /***/ }),
diff --git a/src/install-pypy.ts b/src/install-pypy.ts
index 3ee6207d..1d65839f 100644
--- a/src/install-pypy.ts
+++ b/src/install-pypy.ts
@@ -206,10 +206,7 @@ export function pypyVersionToSemantic(versionSpec: string) {
 }
 
 export function isArchPresentForWindows(item: any, architecture: string) {
-  // convert x32 to x86 cause os.arch() return x32 for 32-bit system but PyPy releases json has x86 arch value.
-  if (architecture === 'x32') {
-    architecture = 'x86';
-  }
+  architecture = ReplaceX32toX86(architecture);
   return item.files.some(
     (file: any) => {
       return file.arch === architecture && WINDOWS_PLATFORMS.includes(file.platform);
@@ -228,9 +225,7 @@ export function isArchPresentForMacOrLinux(
 }
 
 export function findAssetForWindows(releases: any, architecture: string) {
-  if (architecture === 'x32') {
-    architecture = 'x86';
-  }
+  architecture = ReplaceX32toX86(architecture);
   return releases.files.find(
     (item: any) => {
       return item.arch === architecture && WINDOWS_PLATFORMS.includes(item.platform);
@@ -247,3 +242,11 @@ export function findAssetForMacOrLinux(
     (item: any) => item.arch === architecture && item.platform === platform
   );
 }
+
+function ReplaceX32toX86(architecture: string): string {
+  // convert x32 to x86 because os.arch() return x32 for 32-bit systems but PyPy releases json has x86 arch value.
+  if (architecture === 'x32') {
+    architecture = 'x86';
+  }
+  return architecture;
+}