Distinguish undetected exec from unknown exec name

alire-project · Feb 15, 2024 · ecc6c72 · ecc6c72
1 parent dd79711
commit ecc6c72
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/alire/alire-origins-deployers-system-unknown.ads b/src/alire/alire-origins-deployers-system-unknown.ads
@@ -17,7 +17,7 @@ package Alire.Origins.Deployers.System.Unknown is
    is (Outcome_Failure ("unknown distro, no system deployer"));
 
    overriding
-   function Executable_Name (This : Deployer) return String
-   is ("nonexistent-package-manager-that-alire-musnt-find");
+   function Executable_Name (This : Deployer) return String is ("");
+   --  Must be "" so no detection is attempted
 
 end Alire.Origins.Deployers.System.Unknown;
diff --git a/src/alire/alire-origins-deployers-system.adb b/src/alire/alire-origins-deployers-system.adb
@@ -154,7 +154,11 @@ package body Alire.Origins.Deployers.System is
 
    function Executable_Path return Optional_Absolute_Path is
    begin
-      return OS_Lib.Locate_Exec_On_Path (Executable_Name);
+      if Executable_Name /= "" then
+         return OS_Lib.Locate_Exec_On_Path (Executable_Name);
+      else
+         return "";
+      end if;
    end Executable_Path;
 
 end Alire.Origins.Deployers.System;
diff --git a/src/alr/alr-commands-version.adb b/src/alr/alr-commands-version.adb
@@ -125,8 +125,10 @@ package body Alr.Commands.Version is
            .Append ("system package manager:")
            .Append (if System_Manager /= ""
                     then System_Manager
-                    else "not found: `"
-                       & Origins.Deployers.System.Executable_Name & "`")
+                    else "not found: "
+                    & (if Origins.Deployers.System.Executable_Name /= ""
+                      then "`" & Origins.Deployers.System.Executable_Name & "`"
+                      else "unknown package manager"))
            .New_Row;
          Table
            .Append ("distro detection disabled:")