Better reporting on failures resolving dependencies
This commit is contained in:
@@ -27,7 +27,7 @@ package body Alire.OS_Lib is
|
|||||||
function Spawn (Command : String;
|
function Spawn (Command : String;
|
||||||
Arguments : String := "") return Integer is
|
Arguments : String := "") return Integer is
|
||||||
begin
|
begin
|
||||||
Log ("Spawning: " & Command & " " & Arguments, Verbose);
|
Log ("Spawning: " & Command & " " & Arguments, Debug);
|
||||||
return
|
return
|
||||||
(Spawn (Locate_In_Path (Command),
|
(Spawn (Locate_In_Path (Command),
|
||||||
Argument_String_To_List (Arguments).all));
|
Argument_String_To_List (Arguments).all));
|
||||||
|
|||||||
+7
-3
@@ -25,7 +25,7 @@ package body Alire.Query is
|
|||||||
use Containers.Project_Release_Maps;
|
use Containers.Project_Release_Maps;
|
||||||
begin
|
begin
|
||||||
for Rel of I loop
|
for Rel of I loop
|
||||||
Log (" " & Rel.Milestone_Image);
|
Log (" " & Rel.Milestone_Image, Verbose);
|
||||||
end loop;
|
end loop;
|
||||||
end Print_Solution;
|
end Print_Solution;
|
||||||
|
|
||||||
@@ -57,7 +57,7 @@ package body Alire.Query is
|
|||||||
is
|
is
|
||||||
begin
|
begin
|
||||||
if Unresolved.Is_Empty then
|
if Unresolved.Is_Empty then
|
||||||
Log ("Dependency solution found.");
|
Log ("Dependencies resolved");
|
||||||
Print_Solution (Frozen);
|
Print_Solution (Frozen);
|
||||||
return Frozen;
|
return Frozen;
|
||||||
else
|
else
|
||||||
@@ -115,7 +115,11 @@ package body Alire.Query is
|
|||||||
begin
|
begin
|
||||||
Success := False;
|
Success := False;
|
||||||
|
|
||||||
return Resolve (Deps, Containers.Project_Release_Maps.Empty_Map, Success);
|
return I : constant Instance := Resolve (Deps, Containers.Project_Release_Maps.Empty_Map, Success) do
|
||||||
|
if not Success then
|
||||||
|
Log ("Dependency resolution failed");
|
||||||
|
end if;
|
||||||
|
end return;
|
||||||
end Resolve;
|
end Resolve;
|
||||||
|
|
||||||
end Alire.Query;
|
end Alire.Query;
|
||||||
|
|||||||
+2
-2
@@ -8,8 +8,8 @@ package body Alire is
|
|||||||
GNAT.IO.Put_Line
|
GNAT.IO.Put_Line
|
||||||
((case Level is
|
((case Level is
|
||||||
when Terse => "",
|
when Terse => "",
|
||||||
when Verbose => "> ",
|
when Verbose => "-> ",
|
||||||
when Debug => ">> ") & S);
|
when Debug => "-->> ") & S);
|
||||||
end if;
|
end if;
|
||||||
end Log;
|
end Log;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user