Reword information message

alire-project · Nov 16, 2023 · be0ad22 · be0ad22
1 parent 100fc0b
commit be0ad22
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/alire/alire-solutions-diffs.adb b/src/alire/alire-solutions-diffs.adb
@@ -23,7 +23,8 @@ package body Alire.Solutions.Diffs is
       Unpinned,   -- A release being unpinned
       Unchanged,  -- An unchanged dependency/release
       Missing,    -- A missing dependency
-      Binary      -- A binary, system or external release
+      Binary,     -- A binary, system or external release
+      Info        -- General info icon
      );
 
    ----------
@@ -42,7 +43,8 @@ package body Alire.Solutions.Diffs is
              when Unpinned   => TTY.Emph  (U ("🎈")), -- alts: 𐩒🎈
              when Unchanged  => TTY.OK    (U ("=")),
              when Missing    => TTY.Error (U ("❗")), -- alts: ⚠️❗‼️
-             when Binary     => TTY.Warn  (U ("📦")))
+             when Binary     => TTY.Warn  (U ("📦")),
+             when Info       => TTY.Emph  (U ("🛈")))
        else
          (case Change is
              when Added      => U ("+"),
@@ -54,7 +56,8 @@ package body Alire.Solutions.Diffs is
              when Unpinned   => U ("o"),
              when Unchanged  => U ("="),
              when Missing    => U ("!"),
-             when Binary     => U ("b")
+             when Binary     => U ("b"),
+             when Info       => U ("i")
          ));
 
    --  This type is used to summarize every detected change
@@ -403,11 +406,14 @@ package body Alire.Solutions.Diffs is
             then
                Trace.Log (Prefix, Level);
                Trace.Log
-                 (Prefix & Icon (Missing)
-                  & " The solution requires the download of");
+                 (Prefix & Icon (Info)
+                  & "  The solution requires a toolchain that is");
                Trace.Log
                  (Prefix
-                  & "   a toolchain not currently installed.");
+                  & "   not yet installed. Accepting the solution");
+               Trace.Log
+                 (Prefix
+                  & "   will download and install this toolchain.");
                return;
             end if;
          end loop;

diff --git a/testsuite/tests/solver/compiler-installed/test.py b/testsuite/tests/solver/compiler-installed/test.py
@@ -35,7 +35,7 @@
 # results in a complete solution but with installation warning
 alr_with("gnat", delete=True, manual=False)
 p = run_alr("with", f"gnat/={version}", quiet=False)
-assert_match(".*solution requires the download", p.out)
+assert_match(".*solution requires a toolchain", p.out)
 match_solution(f"gnat=8888.0.0 (gnat_native) (origin: binary_archive)",
                escape=True)