diff --git a/src/alire/alire-externals-from_system.adb b/src/alire/alire-externals-from_system.adb index 4d449902f..b0edceedb 100644 --- a/src/alire/alire-externals-from_system.adb +++ b/src/alire/alire-externals-from_system.adb @@ -160,7 +160,8 @@ package body Alire.Externals.From_System is -- We show either the requested Distro only, or all distros, which is -- signaled by Distro = Unknown. - if Concrete_Distro = Distro or else Distro = Platforms.Distro_Unknown + if Concrete_Distro = Distro or else + Distro = Platforms.Distribution_Unknown then declare On_Distro : constant Conditional_Packages.Tree := diff --git a/src/alire/alire-platforms-current.ads b/src/alire/alire-platforms-current.ads index 5baae4b92..6a8fe6d2a 100644 --- a/src/alire/alire-platforms-current.ads +++ b/src/alire/alire-platforms-current.ads @@ -45,7 +45,7 @@ package Alire.Platforms.Current is -- via config. function Distribution_Is_Known return Boolean is - (Platforms."/=" (Distribution, Platforms.Distro_Unknown)); + (Platforms."/=" (Distribution, Platforms.Distribution_Unknown)); function Host_Architecture return Platforms.Architectures; @@ -67,7 +67,7 @@ private function Distribution return Platforms.Distributions is (if Disable_Distribution_Detection - then Platforms.Distro_Unknown + then Platforms.Distribution_Unknown else Detected_Distribution); ----------------------- @@ -103,7 +103,7 @@ private --------------- function Toolchain return Platforms.Toolchains is - (if Distribution /= Distro_Unknown + (if Distribution /= Distribution_Unknown and then Alire.OS_Lib.Subprocess.Locate_In_Path ("gprconfig") = "/usr/bin/gprconfig" diff --git a/src/alire/alire-platforms.ads b/src/alire/alire-platforms.ads index 13507132a..f78e08e41 100644 --- a/src/alire/alire-platforms.ads +++ b/src/alire/alire-platforms.ads @@ -43,7 +43,7 @@ package Alire.Platforms with Preelaborate is Suse, Homebrew, Macports, - Distro_Unknown); + Distribution_Unknown); subtype Known_Distributions is Distributions range Distributions'First .. @@ -70,7 +70,7 @@ package Alire.Platforms with Preelaborate is Suse => Zypper, Homebrew => Homebrew, Macports => Macports, - Distro_Unknown => Packager_Unknown); + Distribution_Unknown => Packager_Unknown); type Toolchains is (System, -- Provided through system packages, able to use other diff --git a/src/alire/alire-utils-tools.adb b/src/alire/alire-utils-tools.adb index ce79cb2f1..1d8a07bdb 100644 --- a/src/alire/alire-utils-tools.adb +++ b/src/alire/alire-utils-tools.adb @@ -52,7 +52,7 @@ package body Alire.Utils.Tools is begin case Distribution is - when Distro_Unknown => + when Distribution_Unknown => -- Cannot have package for an unknown distribution return ""; diff --git a/src/alire/os_freebsd/alire-platforms-current__freebsd.adb b/src/alire/os_freebsd/alire-platforms-current__freebsd.adb index baaf885bf..5fb0560d5 100644 --- a/src/alire/os_freebsd/alire-platforms-current__freebsd.adb +++ b/src/alire/os_freebsd/alire-platforms-current__freebsd.adb @@ -7,8 +7,8 @@ package body Alire.Platforms.Current is -- Detected_Distribution -- --------------------------- - function Detected_Distribution return Platforms.Distributions is - (Platforms.Distro_Unknown); + function Detected_Distribution return Platforms.Distributions + is (Platforms.Distribution_Unknown); ----------------------- -- Distribution_Root -- diff --git a/src/alire/os_linux/alire-platforms-current__linux.adb b/src/alire/os_linux/alire-platforms-current__linux.adb index 802574644..7b05c6ed8 100644 --- a/src/alire/os_linux/alire-platforms-current__linux.adb +++ b/src/alire/os_linux/alire-platforms-current__linux.adb @@ -24,7 +24,7 @@ package body Alire.Platforms.Current is Trace.Debug ("Distribution identity file not found: " & OS_Identity_File); Distro_Cached := True; - Cached_Distro := Distro_Unknown; + Cached_Distro := Distribution_Unknown; return Cached_Distro; else declare @@ -79,7 +79,7 @@ package body Alire.Platforms.Current is end; end loop; - return Distro_Unknown; + return Distribution_Unknown; end Get_Os_Release_Value_For_Key; @@ -89,7 +89,7 @@ package body Alire.Platforms.Current is Get_Os_Release_Value_For_Key (Key => "id"); -- If no supported distribution found, fallback to id_like key - if Cached_Distro = Distro_Unknown then + if Cached_Distro = Distribution_Unknown then Trace.Debug ("Unknown distro for key 'id', falling back to 'id_like'"); Cached_Distro := @@ -97,7 +97,7 @@ package body Alire.Platforms.Current is end if; -- Still an unsupported distribution ? - if Cached_Distro = Distro_Unknown then + if Cached_Distro = Distribution_Unknown then Trace.Debug ("Found unsupported distro: " & Release (1)); end if; @@ -109,7 +109,7 @@ package body Alire.Platforms.Current is when E : Checked_Error => Trace.Debug ("Unable to detect distribution:"); Log_Exception (E); - return Distro_Unknown; + return Distribution_Unknown; end Detected_Distribution; ----------------------- diff --git a/src/alire/os_macos/alire-platforms-current__macos.adb b/src/alire/os_macos/alire-platforms-current__macos.adb index faa45aef2..19a9a7440 100644 --- a/src/alire/os_macos/alire-platforms-current__macos.adb +++ b/src/alire/os_macos/alire-platforms-current__macos.adb @@ -29,7 +29,7 @@ package body Alire.Platforms.Current is then Homebrew elsif Macports_Present then Macports - else Distro_Unknown); + else Distribution_Unknown); ----------------------- -- Distribution_Root -- diff --git a/src/alire/os_windows/alire-platforms-current__windows.adb b/src/alire/os_windows/alire-platforms-current__windows.adb index 971f7e2dd..8262e4b7b 100644 --- a/src/alire/os_windows/alire-platforms-current__windows.adb +++ b/src/alire/os_windows/alire-platforms-current__windows.adb @@ -20,7 +20,7 @@ package body Alire.Platforms.Current is -- Windows implementation Distrib_Detected : Boolean := False; - Distrib : Platforms.Distributions := Platforms.Distro_Unknown; + Distrib : Platforms.Distributions := Platforms.Distribution_Unknown; ------------------ -- Detect_Msys2 -- @@ -72,7 +72,7 @@ package body Alire.Platforms.Current is return; end if; - Distrib := Platforms.Distro_Unknown; + Distrib := Platforms.Distribution_Unknown; end Detect_Distrib; ------------------ diff --git a/src/alr/alr-commands-show.adb b/src/alr/alr-commands-show.adb index 20785413b..93094aeab 100644 --- a/src/alr/alr-commands-show.adb +++ b/src/alr/alr-commands-show.adb @@ -180,7 +180,7 @@ package body Alr.Commands.Show is External.Detail (if Cmd.System then Alire.Platforms.Current.Distribution - else Alire.Platforms.Distro_Unknown); + else Alire.Platforms.Distribution_Unknown); Available : Alire.Conditional.Availability := (if Cmd.System then External.On_Platform diff --git a/testsuite/drivers/alr.py b/testsuite/drivers/alr.py index 4ad58ed7a..7afcc207b 100644 --- a/testsuite/drivers/alr.py +++ b/testsuite/drivers/alr.py @@ -24,7 +24,7 @@ class CalledProcessError(Exception): def distro_is_known(): p = run_alr('version') - return not re.match('.*distribution:.*DISTRO_UNKNOWN.*', + return not re.match('.*distribution:.*DISTRIBUTION_UNKNOWN.*', p.out, flags=re.S) diff --git a/testsuite/tests/config/distro-disable/test.py b/testsuite/tests/config/distro-disable/test.py index 450efe3cd..ecc1278da 100644 --- a/testsuite/tests/config/distro-disable/test.py +++ b/testsuite/tests/config/distro-disable/test.py @@ -2,10 +2,6 @@ Verify that disabling distro detection works as intended """ -import os - -from glob import glob - from drivers.alr import run_alr, distro_is_known run_alr("config", "--global",