search for: read_sourc

Gracefully handle files with no sections; extend the validate.sh test to try to validate an empty file. --- builder/index-parse.y | 2 ++ builder/website/validate.sh | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/builder/index-parse.y b/builder/index-parse.y index 9355bd4..5133959 100644 --- a/builder/index-parse.y +++ b/builder/index-parse.y @@ -108,6 +108,8 @@ sections:

...s.mli b/builder/sources.mli index 2a94c54..e861310 100644 --- a/builder/sources.mli +++ b/builder/sources.mli @@ -21,6 +21,9 @@ type source = { uri : string; gpgkey : Utils.gpgkey_type; proxy : Downloader.proxy_mode; + format : source_format; } +and source_format = +| FormatNative val read_sources : unit -> source list diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod index b4a341f..fc49d4d 100644 --- a/builder/virt-builder.pod +++ b/builder/virt-builder.pod @@ -1169,6 +1169,22 @@ configuration. If not present, the assumed value is to respect the proxy settings of the s...

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623

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

...builder.cmx diff --git a/builder/builder.ml b/builder/builder.ml index af61538..c7f1dae 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -150,22 +150,23 @@ let main () = (* Download the sources. *) let downloader = Downloader.create ~verbose ~curl ~cache in let repos = Sources.read_sources ~prog ~verbose in - let repos = List.map ( - fun { Sources.uri = uri; Sources.gpgkey = gpgkey; Sources.proxy = proxy } -> - uri, gpgkey, proxy - ) repos in let sources = List.map ( fun (source, fingerprint) -> - source, Utils.Fingerprint fingerprint, Downloader.System...

...) + let tmpdir = Mkdtemp.temp_dir "virt-builder." "" in + rmdir_on_exit tmpdir; + (* Download the sources. *) - let downloader = Downloader.create ~curl:cmdline.curl ~cache in + let downloader = Downloader.create ~curl:cmdline.curl ~cache ~tmpdir in let repos = Sources.read_sources () in let sources = List.map ( fun (source, fingerprint) -> @@ -197,7 +204,8 @@ let main () = let sigchecker = Sigchecker.create ~gpg:cmdline.gpg ~check_signature:cmdline.check_signature - ~gpgkey:sourc...

...) + let tmpdir = Mkdtemp.temp_dir "virt-builder." "" in + rmdir_on_exit tmpdir; + (* Download the sources. *) - let downloader = Downloader.create ~curl:cmdline.curl ~cache in + let downloader = Downloader.create ~curl:cmdline.curl ~cache ~tmpdir in let repos = Sources.read_sources () in let sources = List.map ( fun (source, fingerprint) -> @@ -197,7 +204,8 @@ let main () = let sigchecker = Sigchecker.create ~gpg:cmdline.gpg ~check_signature:cmdline.check_signature - ~gpgkey:sourc...

Hi, attached there is a serie of patches that completes the work on making virt-builder use .conf files, shipped in XDG directories, to configure all the available sources of indexes used. This also removes the hardcoded default location, replaced now with a configuration file (which may be not used at all). Thanks, Pino Toscano (8): builder: allow "no key" as key in Sigchecker

...exn -> warning (f_"cache %s: %s") dir (Printexc.to_string exn); warning (f_"disabling the cache"); @@ -146,8 +145,8 @@ let main () = in (* Download the sources. *) - let downloader = Downloader.create ~verbose ~curl ~cache in - let repos = Sources.read_sources ~verbose in + let downloader = Downloader.create ~curl ~cache in + let repos = Sources.read_sources () in let sources = List.map ( fun (source, fingerprint) -> { @@ -162,9 +161,9 @@ let main () = List.map ( fun source -> let sigchecker = -...

...one -> None | Some dir -> try Some (Cache.create ~directory:dir) @@ -160,7 +156,7 @@ let main () = in (* Download the sources. *) - let downloader = Downloader.create ~curl ~cache in + let downloader = Downloader.create ~curl:cmdline.curl ~cache in let repos = Sources.read_sources () in let sources = List.map ( fun (source, fingerprint) -> @@ -170,15 +166,16 @@ let main () = proxy = Downloader.SystemProxy; format = Sources.FormatNative; } - ) sources in + ) cmdline.sources in let sources = List.append sources repos in let index :...

Add a new optional parameter for the Curl ADT, so temporary files can be created in a specified directory (which is supposed to be temporary, and disposed only when the application quits). --- mllib/curl.ml | 10 ++++++---- mllib/curl.mli | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mllib/curl.ml b/mllib/curl.ml index 376406e..baa75ec 100644 --- a/mllib/curl.ml +++

Add a new optional parameter for the Curl ADT, so temporary files can be created in a specified directory (which is supposed to be temporary, and disposed only when the application quits). --- mllib/curl.ml | 16 +++++++++++----- mllib/curl.mli | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mllib/curl.ml b/mllib/curl.ml index 376406e..7d07125 100644 --- a/mllib/curl.ml

...pe '%s' in %s, skipping it\n") prog fmt file; diff --git a/builder/sources.mli b/builder/sources.mli index e861310..e621a9f 100644 --- a/builder/sources.mli +++ b/builder/sources.mli @@ -25,5 +25,6 @@ type source = { } and source_format = | FormatNative +| FormatSimpleStreams val read_sources : unit -> source list diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod index fc49d4d..0de643a 100644 --- a/builder/virt-builder.pod +++ b/builder/virt-builder.pod @@ -1181,6 +1181,13 @@ The possible values are: The native format of the C<virt-builder> repository. See al...

...pe '%s' in %s, skipping it\n") prog fmt file; diff --git a/builder/sources.mli b/builder/sources.mli index e861310..e621a9f 100644 --- a/builder/sources.mli +++ b/builder/sources.mli @@ -25,5 +25,6 @@ type source = { } and source_format = | FormatNative +| FormatSimpleStreams val read_sources : unit -> source list diff --git a/builder/test-simplestreams/streams/v1/index.json b/builder/test-simplestreams/streams/v1/index.json new file mode 100644 index 0000000..3180af7 --- /dev/null +++ b/builder/test-simplestreams/streams/v1/index.json @@ -0,0 +1,18 @@ +{ + "format": &quo...

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: - check the pasted metadata: listing and creating images works, so most of the current metadata is correct - possibly wait

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

...conf file = with Not_found | Invalid_argument _ -> acc ) sections [] in - if verbose () then ( - printf (f_"%s: ... read %d sources\n") prog (List.length sources); - ); + debug "read %d sources" (List.length sources); sources @@ -144,14 +134,10 @@ let read_sources () = s ) with | Unix_error (code, fname, _) -> - if verbose () then ( - printf (f_"%s: file error: %s: %s\n") prog fname (error_message code) - ); - acc + debug "file error: %s: %s\n&quo...

Add a Common_utils.debug function for printing messages only when in verbose mode. Rich.

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. Thanks, Pino Toscano (4): builder: add non-int revisions builder: add simple libyajl binding build: expose HAVE_YAJL to automake