search for: zypp_rpm_list_files

...laf at aepfle.de> --- src/supermin_zypp_rpm.ml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/supermin_zypp_rpm.ml b/src/supermin_zypp_rpm.ml index 720f50a..1c6243d 100644 --- a/src/supermin_zypp_rpm.ml +++ b/src/supermin_zypp_rpm.ml @@ -175,12 +175,18 @@ let rec zypp_rpm_list_files pkg = let mode = int_of_string mode in let size = int_of_string size in if test_flag 'd' then None (* ignore documentation *) - else + else ( + (* Skip unreadable files when called as non-root *) + if Unix.getu...

...t;olaf at aepfle.de> --- src/supermin_zypp_rpm.ml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/supermin_zypp_rpm.ml b/src/supermin_zypp_rpm.ml index 1c6243d..4247d09 100644 --- a/src/supermin_zypp_rpm.ml +++ b/src/supermin_zypp_rpm.ml @@ -173,7 +173,7 @@ let rec zypp_rpm_list_files pkg = | [filename; flags; mode; size] -> let test_flag = String.contains flags in let mode = int_of_string mode in - let size = int_of_string size in + let size = int_of_string size in if test_flag 'd' then None (* ignore do...

...+ List.filter (fun s -> s <> "") pkg_names + +let zypp_rpm_resolve_dependencies_and_download names = + if use_installed then + zypp_rpm_resolve_dependencies_and_download_use_installed names + else + zypp_rpm_resolve_dependencies_and_download_no_installed names + let rec zypp_rpm_list_files pkg = (* Run rpm -qlp with some extra magic. *) let cmd = - sprintf "rpm -q --qf '[%%{FILENAMES} %%{FILEFLAGS:fflags} %%{FILEMODES} %%{FILESIZES}\\n]' -p %S" + sprintf "rpm -q --qf '[%%{FILENAMES} %%{FILEFLAGS:fflags} %%{FILEMODES} %%{FILESIZES}\\n]' %s %S...

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

...- zypp_rpm_resolve_dependencies_and_download_use_installed names + zypp_rpm_resolve_dependencies_and_download_use_installed names mode else - zypp_rpm_resolve_dependencies_and_download_no_installed names + zypp_rpm_resolve_dependencies_and_download_no_installed names mode let rec zypp_rpm_list_files pkg = (* Run rpm -qlp with some extra magic. *) let cmd = sprintf "rpm -q --qf '[%%{FILENAMES} %%{FILEFLAGS:fflags} %%{FILEMODES} %%{FILESIZES}\\n]' %s %S" -- 1.8.3.222.g430da9e

...amesOnly then ( - eprintf "supermin: zypp-rpm: --names-only flag is not implemented\n"; - exit 1 - ); - - if use_installed then - zypp_rpm_resolve_dependencies_and_download_use_installed names - else - zypp_rpm_resolve_dependencies_and_download_no_installed names - -let rec zypp_rpm_list_files pkg = - (* Run rpm -qlp with some extra magic. *) - let cmd = - sprintf "rpm -q --qf '[%%{FILENAMES} %%{FILEFLAGS:fflags} %%{FILEMODES} %%{FILESIZES}\\n]' %s %S" - (if use_installed then "" else "-p") - pkg in - let lines = run_command_get_lines...