search for: ph_get_file_from_packag

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

...ackage_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 +++ b/src/supermin_package_handlers.mli @@ -27,12 +27,12 @@ type packa...

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.

...dir // path) (mode land 0o777 lor 0o400) - ) - - (* For config files we can't rely on the host-installed copy - * since the admin may have modified it. We have to get the - * original file from the package. - *) - else if config then ( - let outfile = ph.ph_get_file_from_package pkg path in - - (* Note that the output config file might not be a regular file. *) - let statbuf = lstat outfile in - - let destfile = rootdir // path in - - (* Depending on the file type, copy it to destination. *) - match statbuf.st_kind with - | S_REG...