) packages
) in
+ (* Canonicalize the name of directories, so that /a and /a/ are the same. *)
+ let files =
+ List.map (
+ fun (filename, ft, pkg) ->
+ let len = String.length filename in
+ let filename =
+ if len > 1 (* don't rewrite "/" *) && ft.ft_dir
+ && filename.[len-1] = '/' then
+ String.sub filename 0 (len-1)
+ else
+ filename in
+ (filename, ft, pkg)
+ ) files in
+
(* Sort and combine duplicate files. *)
let files =
let files = List.sort compare files in
let combine (name1, ft1, pkg1) (name2, ft2, pkg2) =
(* Rules for combining files. *)
if ft1.ft_config || ft2.ft_config then (
- eprintf "febootstrap: error: %s is a config file which is listed in two packages (%s, %s)\n"
- name1 pkg1 pkg2;
- exit 1
- );
- if (ft1.ft_dir || ft2.ft_dir) && (not (ft1.ft_dir && ft2.ft_dir)) then (
+ (* It's a fairly frequent bug in Fedora for two packages to
+ * incorrectly list the same config file. Allow this, provided
+ * the size of both files is 0.
+ *)
+ if ft1.ft_size = 0 && ft2.ft_size = 0 then
+ (name1, ft1, pkg1)
+ else (
+ eprintf "febootstrap: error: %s is a config file which is listed in two packages (%s, %s)\n"
+ name1 pkg1 pkg2;
+ exit 1
+ )
+ )
+ else if (ft1.ft_dir || ft2.ft_dir) && (not (ft1.ft_dir && ft2.ft_dir)) then (
eprintf "febootstrap: error: %s appears as both directory and ordinary file (%s, %s)\n"
name1 pkg1 pkg2;
exit 1
- );
- if ft1.ft_ghost then
+ )
+ else if ft1.ft_ghost then
(name2, ft2, pkg2)
else
(name1, ft1, pkg1)