search for: print_entri

--- builder/builder.ml | 12 ++++++++++++ builder/index_parser.ml | 16 ++++++++++++++++ builder/index_parser.mli | 4 ++++ builder/list_entries.ml | 17 +++++++++++++++++ builder/virt-builder.pod | 8 ++++++++ 5 files changed, 57 insertions(+) diff --git a/builder/builder.ml b/builder/builder.ml index a0ef6d7..c317816 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -192,6

Move the index and entry definitions in an own Index module, together with the (previously internal to Index_parser) print_entry debugging function. --- builder/Makefile.am | 2 + builder/builder.ml | 36 +++++++-------- builder/index.ml | 117 +++++++++++++++++++++++++++++++++++++++++++++++ builder/index.mli | 41 +++++++++++++++++ builder/index_parser.ml | 96

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- builder/index.mli | 3 +++ builder/index_parser.ml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ builder/index_parser.mli | 6 ++++++ 3 files changed, 61 insertions(+) diff --git a/builder/index.mli

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- builder/index.mli | 3 +++ builder/index_parser.ml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ builder/index_parser.mli | 6 ++++++ 3 files changed, 61 insertions(+) diff --git a/builder/index.mli

Add an architecture field for all the entries in each index, so we know which architecture they are (not used right now, but will be in the future). The problematic part here is properly marking with the correct architecture: since we only know the current index on libguestfs.org contains x86_64/amd64 images, entries coming from it are marked that way; images in all the other indexes

Extend Index_parser.entry to hold a list of checksums to validate, and validate all of them. This does change nothing currently, as only sha512 is read, while still allowing us to fetch more checksums if needed. --- builder/builder.ml | 6 +++--- builder/checksums.ml | 3 +++ builder/checksums.mli | 3 +++ builder/index_parser.ml | 22 +++++++++++++++-------

Introduce a mandatory arch= key in all the entries of index files, to identify which architecture is each. Adapt the long and JSON list outputs to print also this new field. This introduces an incompatibility with index files created with virt-builder < 1.26, as they will be rejected until entries will have the arch= key added (which is ignored by older virt-builder, so adding it will not

Change Index.arch to the type (Arch of string | GuessedArch of string). In a future commit, the index parser will allow arch not to be set for some cases. Thus arch value will be guessed by inspecting the image. However we need to distinguish between a set value and a guessed one. Using this new type will help it: match arch with | Arch s -> (* This is a set value *) |

Change Index.arch to the type (Arch of string | GuessedArch of string). In a future commit, the index parser will allow arch not to be set for some cases. Thus arch value will be guessed by inspecting the image. However we need to distinguish between a set value and a guessed one. Using this new type will help it: match arch with | Arch s -> (* This is a set value *) |

Hi, this series adds a basic support for Simple Streams v1.0 metadata files. This makes it possible to create a repository .conf files with [cirros] uri=http://download.cirros-cloud.net format=simplestreams to read the latest version of each CirrOS image. TODO items: - a bit more testing: listing and creating images works, so the current metadata is correct - handle revisions, so newer

Instead of passing the (uri, key, proxy) tuple around, pass the whole Sources.source record; this requires creating proper Sources.source also for uri+fingerprint passed via command line. No functional changes. --- builder/Makefile.am | 2 +- builder/builder.ml | 17 +++++++++-------- builder/index_parser.ml | 14 +++++++------- builder/index_parser.mli | 2 +-

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- .gitignore | 1 + builder/Makefile.am | 36 +++++++++++++++- builder/index.mli | 3 ++ builder/index_parser.ml | 52 +++++++++++++++++++++++ builder/index_parser.mli | 6 +++

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- .gitignore | 1 + builder/Makefile.am | 36 +++++++++++- builder/index.mli | 3 + builder/index_parser.ml | 54 ++++++++++++++++++ builder/index_parser.mli | 4 ++

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- .gitignore | 1 + builder/Makefile.am | 36 +++++++++++- builder/index.mli | 3 + builder/index_parser.ml | 46 +++++++++++++++ builder/index_parser.mli | 4 ++

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- .gitignore | 1 + builder/Makefile.am | 36 +++++++++++- builder/index.mli | 3 + builder/index_parser.ml | 54 ++++++++++++++++++ builder/index_parser.mli | 4 ++

These are now passed using a curl configuration file, which is a little bit safer than using command lines. virt-builder doesn't need to pass usernames and passwords to curl, but if it ever does in future this will be a lot safer. --- builder/Makefile.am | 1 + builder/builder.ml | 6 +-- builder/downloader.ml | 94

The 'may' function is a higher-order function (HOF) that replaces: match x with | None -> () | Some x -> f x with: may f x The idea comes from lablgtk (OCaml Gtk bindings) where it is widely used. If this change is clearer than previous code, then this could be used in many more places. However I previously steered clear from using HOFs like this because they can be

Copy the information about the proxy of a source in all the entries of that source; this way it is possible to use it later when accessing to the actual image of an entry. --- builder/index_parser.ml | 2 ++ builder/index_parser.mli | 1 + 2 files changed, 3 insertions(+) diff --git a/builder/index_parser.ml b/builder/index_parser.ml index 2040656..40b2116 100644 --- a/builder/index_parser.ml

No functional change, just code motion. --- builder/builder.ml | 6 +++--- builder/list_entries.ml | 12 ++++++------ builder/list_entries.mli | 2 +- builder/sigchecker.ml | 5 ----- builder/sigchecker.mli | 7 +------ builder/utils.ml | 5 +++++ 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/builder/builder.ml b/builder/builder.ml index

Add support for non-integer revisions of entries, comparing them as integer when possible. --- builder/builder.ml | 9 ++++++++- builder/cache.ml | 2 +- builder/cache.mli | 6 +++--- builder/downloader.mli | 2 +- builder/index.ml | 4 ++-- builder/index.mli | 2 +- builder/index_parser.ml | 4 ++-- builder/utils.ml | 7 +++++++ 8 files changed, 25