Merge remote-tracking branch 'alire/master' into fix/pin-recurse

alire-project · Jun 22, 2021 · 86da74a · 86da74a
2 parents 6039dd9 + 8ed8d8d
commit 86da74a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 22 deletions.
diff --git a/src/alire/alire-properties-labeled.adb b/src/alire/alire-properties-labeled.adb
@@ -1,5 +1,9 @@
+with Alire.Utils.TTY;
+
 package body Alire.Properties.Labeled is
 
+   package TTY renames Utils.TTY;
+
    ------------
    -- Filter --
    ------------
@@ -136,7 +140,8 @@ package body Alire.Properties.Labeled is
             end if;
 
             if not Utils.Is_Valid_Tag (L.Value) then
-               From.Checked_Error ("Tag string is not valid");
+               From.Checked_Error ("Tag string is not valid: "
+                                   & TTY.Error (L.Value));
             end if;
          when others =>
             null;

diff --git a/src/alr/os_windows/alr-platforms-windows.adb b/src/alr/os_windows/alr-platforms-windows.adb
@@ -17,16 +17,11 @@ package body Alr.Platforms.Windows is
 
    package Cfg renames Alire.Config;
 
-   Msys2_Installer     : constant String := "msys2-x86_64-20200903.exe";
+   Msys2_Installer     : constant String := "msys2-x86_64-20210604.exe";
    Msys2_Installer_URL : constant String :=
-     "https://github.com/msys2/msys2-installer/releases/download/2020-09-03/"
+     "https://github.com/msys2/msys2-installer/releases/download/2021-06-04/"
      & Msys2_Installer;
 
-   Msys2_Installer_Script     : constant String := "auto-install.js";
-   Msys2_Installer_Script_URL : constant String :=
-     "https://raw.githubusercontent.com/msys2/msys2-installer/a588bcc/" &
-     Msys2_Installer_Script;
-
    -------------------
    -- Set_Msys2_Env --
    -------------------
@@ -104,9 +99,6 @@ package body Alr.Platforms.Windows is
    is
       use Alire.Utils;
 
-      Install_Prefix : constant String :=
-        "InstallDir=" & Install_Dir;
-
       Result : Alire.Outcome;
    begin
       if not Query_User_For_Msys2_Install (Install_Dir) then
@@ -121,21 +113,16 @@ package body Alr.Platforms.Windows is
          return Result;
       end if;
 
-      Result := Alire.OS_Lib.Download.File (Msys2_Installer_Script_URL,
-                                            Msys2_Installer_Script,
-                                            Install_Dir);
-      if not Result.Success then
-         return Result;
-      end if;
-
       begin
          --  Run msys2's installer
          Alire.OS_Lib.Subprocess.Checked_Spawn
            (Install_Dir / Msys2_Installer,
             Alire.Utils.Empty_Vector &
-              "--script" & (Install_Dir / Msys2_Installer_Script) &
-              "-v" &
-              Install_Prefix);
+              "in" &
+              "--confirm-command" &
+              "--accept-messages" &
+              "--root" &
+              Install_Dir);
 
       exception
          when others =>

diff --git a/testsuite/tests/index/bad-tag/test.py b/testsuite/tests/index/bad-tag/test.py
@@ -10,7 +10,7 @@
             complain_on_error=False, debug=False, quiet=True)
 assert_match(
     '.*Loading .*hello_world-0.1.0.toml:.*tags:'
-    '.*Tag string is not valid\n',
+    '.*Tag string is not valid: .*\n',
     p.out)
 
 print('SUCCESS')