Rebase tweaks

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

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/alire/alire-solutions-diffs.adb b/src/alire/alire-solutions-diffs.adb
@@ -404,15 +404,19 @@ package body Alire.Solutions.Diffs is
                Trace.Log (Prefix, Level);
                Trace.Log
                  (Prefix & Icon (Missing)
-                  & " The solution requires the (potentially large) ");
+                  & " The solution requires the download of");
                Trace.Log
                  (Prefix
-                  & "  download of a toolchain not currently installed.");
+                  & "   a toolchain not currently installed.");
                return;
             end if;
          end loop;
       end Warn_Toolchain_Download;
 
+      --------------------------------------
+      -- Warn_Unsatisfiable_GNAT_External --
+      --------------------------------------
+
       procedure Warn_Unsatisfiable_GNAT_External is
       begin
          for Dep of This.Latter.All_Dependencies loop
@@ -492,8 +496,10 @@ package body Alire.Solutions.Diffs is
       if Changed then
          Table.Print (Level);
 
-         Warn_Unsatisfiable_GNAT_External;
          Warn_Toolchain_Download;
+         Warn_Unsatisfiable_GNAT_External;
+         --  Only one of those two can happen and emit their warning, so the
+         --  order doesn't matter.
       else
          Trace.Log (Prefix & "No changes between former and new solution.",
                     Level);

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(".*download of a toolchain not currently installed", p.out)
+assert_match(".*solution requires the download", p.out)
 match_solution(f"gnat=8888.0.0 (gnat_native) (origin: binary_archive)",
                escape=True)