search for: ft_dir

...t_of_string size in if test_flag 'd' then None (* ignore documentation *) else ( (* Skip unreadable files when called as non-root *) @@ -206,7 +206,7 @@ let rec zypp_rpm_list_files pkg = List.map (fun name -> name, { ft_dir = true; ft_ghost = false; ft_config = false; ft_mode = 0o40755; - ft_size = 0 }) dirs in + ft_size = 0 }) dirs in let devs = [ "/dev/null"; "/dev/full"; "/dev/zero"; "/dev/random";...

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

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.

...if Unix.getuid() > 0 && + (try Unix.access filename [Unix.R_OK]; false with + Unix_error _ -> eprintf "supermin: EPERM %s\n%!" filename; true) then None + else Some (filename, { ft_dir = mode land 0o40000 <> 0; ft_ghost = test_flag 'g'; ft_config = test_flag 'c'; ft_mode = mode; ft_size = size; }) + ) | _ -> eprintf "supermin: bad output from rpm comma...

...39;.' + ) lines in + let files = List.map ( + fun path -> + let statbuf = lstat path in + let is_dir = statbuf.st_kind = S_DIR in + let config = statbuf.st_kind = S_REG && string_prefix "/etc/" path in + let mode = statbuf.st_perm in + (path, { ft_dir = is_dir; ft_config = config; ft_mode = mode; + ft_ghost = false; ft_size = statbuf.st_size }) + ) lines in + files + +let debian_list_files pkg = + if List.exists ((=) pkg) installed_pkgs then + debian_list_files_installed pkg + else + debian_list_files_downloaded pkg + (* Easy b...

...ot; - (* 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 +let main () = + Random.self_init (); - (* Sort and combine duplicate files. *) - let files = - let...

...h_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 package_handler = { (** After a package handler is selected, this func...

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.