Fix yaml problem with failures related to essential packages

Author: Pietro Abate

CHANGES

@@ -5,6 +5,7 @@ dose3 (4.2) UNRELEASED; urgency=low
  * the new yaml format also drops the architecture suffix in the package and 
    unsat-dependency fields
  * Add new function Depsolver.is_consistent and Debian.Debcudf.get_real_name
+ * Expose Diagnostic.request and Diagnostic.result
  * Update the yaml output of outdated (no more cudf-related cruft in package names)
  * bump yaml output-version to 1.1
 

TODO

@@ -1,4 +1,6 @@
 
+- add test cases for format822 (fielnames in particular)
+
 - add --deb-output822 to DistcheckOptions to output 822 package list
   for distcheck, buildcheck etc of installable packages
 

algo/diagnostic.ml

@@ -240,6 +240,10 @@ let build_explanation_graph ?(addmissing=false) root l =
     )
   in
   let gr = G.create () in
+  (* we add the root, there might be a problem on related to packages
+     not related to the root, but failing to install because of a 
+     global constraint (like conflitting essential packages) *)
+  G.add_vertex gr (add_node root);
   let c = ref 0 in
   (* remove duplicate dependencies/reasons. XXX with long
      list of packages Hashtbl.hash could give wrong results *)
@@ -544,8 +548,8 @@ let print_error ?(condense=false) ?(minimal=false) pp root fmt l =
     Format.fprintf fmt "unsat-conflict: %a@]@," (CudfAdd.pp_vpkglist pp) [vpkg];
     Format.fprintf fmt "@[<v 1>pkg2:@,%a@]" (pp_package_list ~source:true pp) j;
     if not minimal then begin
-      let (pl1,_) = try DJ.shortest_path gr vroot vi with Not_found -> assert false in
-      let (pl2,_) = try DJ.shortest_path gr vroot vj with Not_found -> assert false in
+      let pl1 = try fst(DJ.shortest_path gr vroot vi) with Not_found -> [] in
+      let pl2 = try fst(DJ.shortest_path gr vroot vj) with Not_found -> [] in
       if pl1 <> [] then
         Format.fprintf fmt "@,@[<v 1>depchain1:@,%a@]" (pp_dependencies pp) pl1;
       if pl2 <> [] then

algo/diagnostic.mli

@@ -10,10 +10,11 @@
 (*  library, see the COPYING file for more information.                               *)
 (**************************************************************************************)
 
+(** {2 Un-installability reasons} *)
+
 (** The request provided to the solver *)
 type request = Cudf.package list
 
-(** {2 Un-installability reasons} *)
 type reason =
   |Dependency of (Cudf.package * Cudf_types.vpkg list * Cudf.package list)
   (** Not strictly a un-installability, Dependency (a,vpkglist,pkglist) is used
@@ -53,7 +54,8 @@ type result_int =
 
 type request_int = (int option * int list)
 
-(** {2 Helpers Functions } *)
+(** {3 Helpers Functions } *)
+
 (** Turn an integer result into a cudf result *)
 val diagnosis : Common.Util.projection -> Cudf.universe ->
   result_int -> request_int -> diagnosis
@@ -64,6 +66,8 @@ val result : Common.Util.projection -> Cudf.universe -> result_int -> result
 (** Turn an integer request into a cudf request *)
 val request : Cudf.universe -> 'a * int list -> Cudf.package list
 
+(** {2 Pretty Priting Functions } *)
+
 module ResultHash : Hashtbl.S with type key = reason
 
 (** Collect aggregate information about not installable packages *)

common/cudfAdd.mli

@@ -16,7 +16,7 @@ val hash : Cudf.package -> int
 (** Sort function: sorts a CUDF packages list using the standard CUDF comparison operator in ascending order *)
 val sort : Cudf.package list -> Cudf.package list
 
-(** Data structures: *)
+(** {2 Data structures} *)
 
 (** Specialized hashtable for CUDF packages. *)
 module Cudf_hashtbl : (Hashtbl.S with type key = Cudf.package)