search for: ph_list_files

I just tried to get libguestfs to compile on Ubuntu 11.10 using the latest febootstrap, and the following patches were necessary for me. They are all just reasonable code cleanups *except* for patch 5/5 which is a gross hack for something I don't understand about how Ubuntu 11.10 multiarch support works. Rich.

The new run_shell helper is a copy of run_python, and will be used by upcoming changes. Signed-off-by: Olaf Hering <olaf at aepfle.de> --- src/supermin_utils.ml | 9 +++++++++ src/supermin_utils.mli | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/src/supermin_utils.ml b/src/supermin_utils.ml index f98e09a..cb8a27e 100644 --- a/src/supermin_utils.ml +++ b/src/supermin_utils.ml

...,11 @@ open Supermin_utils open Supermin_cmdline type package_handler = { ph_detect : unit -> bool; ph_init : unit -> unit; - ph_resolve_dependencies_and_download : string list -> string list; + ph_resolve_dependencies_and_download : string list -> mode -> string list; ph_list_files : string -> (string * file_type) list; ph_get_file_from_package : string -> string -> string } and file_type = { ft_dir : bool; diff --git a/src/supermin_package_handlers.mli b/src/supermin_package_handlers.mli index 27750e1..8ee12dd 100644 --- a/src/supermin_package_handlers.mli +...

Joseph, Please try my modified versions of these patches. These are compile-tested on Fedora and they don't break any existing functionality, but I don't have either urpmi nor a statically-linked xz so I cannot fully test them. I have also fixed detection of zlib (2/3). Rich.

...lved packages: %s" (String.concat " " packages); - packages - ) - else packages in +For full instructions, read the supermin(1) man page. - (* Get the list of files. *) - let files = - List.flatten ( - List.map ( - fun pkg -> - let files = ph.ph_list_files pkg in - List.map (fun (filename, ft) -> filename, ft, pkg) files - ) packages - ) in +Options: +" - (* Canonicalize the name of directories, so that /a and /a/ are the same. *) - let files = - List.map ( - fun (filename, ft, pkg) -> - let len = String...