search for: compare_architecture

...7 --------------------------- src/utils.mli | 3 --- 2 files changed, 30 deletions(-) diff --git a/src/utils.ml b/src/utils.ml index f85418f..b25df88 100644 --- a/src/utils.ml +++ b/src/utils.ml @@ -172,33 +172,6 @@ and split_version = function ) in first :: split_version rest -let compare_architecture a1 a2 = - let index_of_architecture = function - | "noarch" | "all" -> 100 - | "i386" | "i486" | "i586" | "i686" | "x86_32" | "x86-32" -> 32 - | "x86_64" | "x86-64" | "amd64&quot...

...n sorts the list of installed packages when resolving a name, picking the right package for the host architecture. Pino Toscano (5): rpm: do not unpack parameters rpm: fix version comparison rpm: query the RPM architecture rpm: fix package sorting (RHBZ#1696822) utils: remove unused 'compare_architecture' function src/librpm-c.c | 10 ++++++++++ src/librpm.ml | 1 + src/librpm.mli | 3 +++ src/ph_rpm.ml | 44 ++++++++++++++++++++++++++++++++++++++------ src/utils.ml | 27 --------------------------- src/utils.mli | 3 --- 6 files changed, 52 insertions(+), 36 deletions(-) -- 2.20.1

...ot;?86"] | _ when String.length host_cpu >= 5 && String.sub host_cpu 0 5 = "armv7" -> ["armmp"] | _ -> [host_cpu] diff --git a/src/utils.ml b/src/utils.ml index 4223be4..e3b8742 100644 --- a/src/utils.ml +++ b/src/utils.ml @@ -183,6 +183,8 @@ let compare_architecture a1 a2 = | a when string_prefix "armv6" a -> 32 | a when string_prefix "armv7" a -> 32 | a when string_prefix "armv8" a -> 64 + | "hppa" | "parisc" -> 32 + | "hppa64" | "parisc64" -> 64 | &...

.../src/rpm.ml +++ b/src/rpm.ml @@ -144,7 +144,7 @@ let rpm_package_of_string str = * architecture. *) let cmp { version = v1; arch = a1 } { version = v2; arch = a2 } = - let i = compare_version v2 v1 in + let i = rpm_vercmp v2 v1 in if i <> 0 then i else compare_architecture a2 a1 in -- 1.9.3

--- src/utils.ml | 21 +++++++++++++++++++++ src/utils.mli | 3 +++ 2 files changed, 24 insertions(+) diff --git a/src/utils.ml b/src/utils.ml index 3e81c21..7ae24bd 100644 --- a/src/utils.ml +++ b/src/utils.ml @@ -204,3 +204,24 @@ let compare_architecture a1 a2 = exit 1 in compare (index_of_architecture a1) (index_of_architecture a2) + +(* Parse a size field, eg. "10G". *) +let parse_size = + let const_re = Str.regexp "^\\([.0-9]+\\)\\([bKMG]\\)$" in + fun field -> + let matches rex = Str.string_match rex fie...

..."supermin: external shell program failed, see earlier error messages\n"; - exit 1 - ) + if Sys.command cmd <> 0 then + error "external shell program failed, see earlier error messages" let rec find s sub = let len = String.length s in @@ -191,8 +192,8 @@ let compare_architecture a1 a2 = | "s390x" -> 64 | "alpha" -> 64 | a -> - eprintf "supermin: missing support for architecture '%s'\nIt may need to be added to supermin.\n" a; - exit 1 + error "missing support for architecture '%s'\nIt...

Hi, few cleanups in the supermin codebase; no actual functional change. Thanks, -- Pino Toscano (3): ext2: simplify tracking of visited modules utils: remove unused run_python function Add and use an helper error function src/build.ml | 20 +++++----------- src/dpkg.ml | 4 +--- src/ext2_initrd.ml | 10 ++++---- src/kernel.ml | 27

...ultiple arches are installed at the same time. We are only + * interested in the highest version with the best + * architecture. + *) + let cmp { version = v1; arch = a1 } { version = v2; arch = a2 } = + let i = compare_version v2 v1 in + if i <> 0 then i + else compare_architecture a2 a1 + in + let rpms = List.sort cmp rpms in + List.hd rpms + + (* Check if an RPM is installed. *) + and check_rpm_installed name = + let cmd = sprintf "rpm -q %s >/dev/null" (quote name) in + 0 = Sys.command cmd + in + + try + Hashtbl.find rpmh str + with +...