fix: fix checking of a pip package existence

Author: aminya

dist/legacy/setup-cpp.js

@@ -68,55 +68,60 @@ const retryErrors = [
  * ```
  */
 export async function installAptPack(packages: AptPackage[], update = false): Promise<InstallationInfo> {
-  const apt: string = getApt()
-
-  for (const { name, version } of packages) {
-    info(`Installing ${name} ${version ?? ""} via ${apt}`)
-  }
+  try {
+    const apt: string = getApt()
 
-  // Update the repos if needed
-  if (update) {
-    updateAptReposMemoized(apt)
-  }
+    for (const { name, version } of packages) {
+      info(`Installing ${name} ${version ?? ""} via ${apt}`)
+    }
 
-  // Add the repos if needed
-  await addRepositories(apt, packages)
+    // Update the repos if needed
+    if (update) {
+      updateAptReposMemoized(apt)
+    }
 
-  const needToInstall = await filterAndQualifyAptPackages(packages, apt)
+    // Add the repos if needed
+    await addRepositories(apt, packages)
 
-  if (needToInstall.length === 0) {
-    info("All packages are already installed")
-    return { binDir: "/usr/bin/" }
-  }
+    const needToInstall = await filterAndQualifyAptPackages(packages, apt)
 
-  // Initialize apt if needed
-  await initAptMemoized(apt)
+    if (needToInstall.length === 0) {
+      info("All packages are already installed")
+      return { binDir: "/usr/bin/" }
+    }
 
-  try {
-    // Add the keys if needed
-    await addAptKeys(packages)
-
-    // Install
-    execRootSync(apt, ["install", "--fix-broken", "-y", ...needToInstall], {
-      ...defaultExecOptions,
-      env: getAptEnv(apt),
-    })
-  } catch (err) {
-    if (isExecaError(err)) {
-      if (retryErrors.some((error) => err.stderr.includes(error))) {
-        warning(`Failed to install packages ${needToInstall}. Retrying...`)
-        execRootSync(
-          apt,
-          ["install", "--fix-broken", "-y", "-o", aptTimeout, ...needToInstall],
-          { ...defaultExecOptions, env: getAptEnv(apt) },
-        )
+    // Initialize apt if needed
+    await initAptMemoized(apt)
+
+    try {
+      // Add the keys if needed
+      await addAptKeys(packages)
+
+      // Install
+      execRootSync(apt, ["install", "--fix-broken", "-y", ...needToInstall], {
+        ...defaultExecOptions,
+        env: getAptEnv(apt),
+      })
+    } catch (err) {
+      if (isExecaError(err)) {
+        if (retryErrors.some((error) => err.stderr.includes(error))) {
+          warning(`Failed to install packages ${needToInstall}. Retrying...`)
+          execRootSync(
+            apt,
+            ["install", "--fix-broken", "-y", "-o", aptTimeout, ...needToInstall],
+            { ...defaultExecOptions, env: getAptEnv(apt) },
+          )
+        }
+      } else {
+        throw err
       }
-    } else {
-      throw err
     }
-  }
 
-  return { binDir: "/usr/bin/" }
+    return { binDir: "/usr/bin/" }
+  } catch (err) {
+    const msg = err instanceof Error ? `${err.message}\n${err.stack}` : String(err)
+    throw new Error(`Failed to install apt packages: ${msg}`)
+  }
 }
 
 async function addRepositories(apt: string, packages: AptPackage[]) {

dist/legacy/setup-cpp.js.map

@@ -55,14 +55,16 @@ export async function setupPipPackWithPython(
 
   // if upgrade is not requested, check if the package is already installed, and return if it is
   if (!upgrade) {
-    const installed = await pipPackageIsInstalled(givenPython, pip, name)
+    const installed = isPipx
+      ? await pipxPackageInstalled(givenPython, name)
+      : await pipPackageIsInstalled(givenPython, name)
     if (installed) {
       const binDir = await finishPipPackageInstall(givenPython, name)
       return { binDir }
     }
   }
 
-  const hasPackage = await pipHasPackage(givenPython, pip, name)
+  const hasPackage = await pipHasPackage(givenPython, name)
   if (hasPackage) {
     try {
       info(`Installing ${name} ${version ?? ""} via ${pip}`)
@@ -84,7 +86,8 @@ export async function setupPipPackWithPython(
         env,
       })
     } catch (err) {
-      info(`Failed to install ${name} via ${pip}: ${err}.`)
+      const msg = err instanceof Error ? `${err.message}\n${err.stack}` : String(err)
+      info(`Failed to install ${name} via ${pip}: ${msg}`)
       if ((await setupPipPackSystem(name)) === null) {
         throw new Error(`Failed to install ${name} via ${pip}: ${err}.`)
       }
@@ -168,6 +171,18 @@ async function getPython(): Promise<string> {
   return pythonBin
 }
 
+async function pipPackageIsInstalled(python: string, name: string) {
+  try {
+    const result = await execa(python, ["-m", "pip", "-qq", "show", name], {
+      stdio: "ignore",
+      reject: false,
+    })
+    return result.exitCode === 0
+  } catch {
+    return false
+  }
+}
+
 type PipxShowType = {
   venvs: Record<string, {
     metadata: {
@@ -180,42 +195,35 @@ type PipxShowType = {
   }>
 }
 
-async function pipPackageIsInstalled(python: string, pip: string, name: string) {
+async function pipxPackageInstalled(python: string, name: string) {
   try {
-    if (pip === "pipx") {
-      const result = await execa(python, ["-m", pip, "list", "--json"], {
-        stdio: "ignore",
-        reject: false,
-      })
-      if (result.exitCode !== 0 || typeof result.stdout !== "string") {
-        return false
-      }
+    const result = await execa(python, ["-m", "pipx", "list", "--json"], {
+      stdio: "ignore",
+      reject: false,
+    })
+    if (result.exitCode !== 0 || typeof result.stdout !== "string") {
+      return false
+    }
 
-      const pipxOut = JSON.parse(result.stdout as unknown as string) as PipxShowType
-      // search among the venvs
-      if (name in pipxOut.venvs) {
+    const pipxOut = JSON.parse(result.stdout) as PipxShowType
+    // search among the venvs
+    if (name in pipxOut.venvs) {
+      return true
+    }
+    // search among the urls
+    for (const venv of Object.values(pipxOut.venvs)) {
+      if (venv.metadata.main_package.package_or_url === name || venv.metadata.main_package.package === name) {
         return true
       }
-      // search among the urls
-      for (const venv of Object.values(pipxOut.venvs)) {
-        if (venv.metadata.main_package.package_or_url === name || venv.metadata.main_package.package === name) {
-          return true
-        }
-      }
     }
-
-    const result = await execa(python, ["-m", pip, "-qq", "show", name], {
-      stdio: "ignore",
-      reject: false,
-    })
-    return result.exitCode === 0
   } catch {
-    return false
+    // ignore
   }
+  return false
 }
 
-async function pipHasPackage(python: string, pip: string, name: string) {
-  const result = await execa(python, ["-m", pip, "-qq", "index", "versions", name], {
+async function pipHasPackage(python: string, name: string) {
+  const result = await execa(python, ["-m", "pip", "-qq", "index", "versions", name], {
     stdio: "ignore",
     reject: false,
   })