search for: proxy_mode

...hen unlink_on_exit template; template in diff --git a/builder/downloader.ml b/builder/downloader.ml index 8c47bad..de9b404 100644 --- a/builder/downloader.ml +++ b/builder/downloader.ml @@ -32,29 +32,24 @@ type t = { cache : Cache.t option; (* cache for templates *) } -type proxy_mode = - | UnsetProxy - | SystemProxy - | ForcedProxy of string - let create ~curl ~cache = { curl = curl; cache = cache; } -let rec download t ?template ?progress_bar ?(proxy = SystemProxy) uri = +let rec download t ?template ?progress_bar ?proxy uri = match template with | None -&gt...

...dex ce012c4..520eb33 100644 --- a/builder/list_entries.mli +++ b/builder/list_entries.mli @@ -16,4 +16,4 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *) -val list_entries : list_format:([ `Short | `Long | `Json ]) -> sources:(string * Sigchecker.gpgkey_type * Downloader.proxy_mode) list -> Index_parser.index -> unit +val list_entries : list_format:([ `Short | `Long | `Json ]) -> sources:(string * Utils.gpgkey_type * Downloader.proxy_mode) list -> Index_parser.index -> unit diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index 489da28..0c292fb 100644...

...ser.ml index 40b2116..0040bf9 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -38,11 +38,14 @@ and entry = { lvexpand : string option; notes : (string * string) list; hidden : bool; + aliases : string list option; sigchecker : Sigchecker.t; proxy : Downloader.proxy_mode; } +let list_separator = " " + let print_entry chan (name, { printable_name = printable_name; file_uri = file_uri; arch = arch; @@ -56,6 +59,7 @@ let print_entry chan (name, { printable_name = printable_name;...

...i | 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 +++ b/builder/index_parser.ml @@ -40,6 +40,7 @@ and entry = { hidden : bool; sigchecker : Sigchecker.t; + proxy : Downloader.proxy_mode; } let print_entry chan (name, { printable_name = printable_name; @@ -259,6 +260,7 @@ let get_index ~prog ~debug ~downloader ~sigchecker ~proxy source = lvexpand = lvexpand; notes = notes; hidden = hidden; +...

...Not_found -> source // path + Not_found -> uri // path ) in diff --git a/builder/index_parser.mli b/builder/index_parser.mli index e25fcc7..c7f244d 100644 --- a/builder/index_parser.mli +++ b/builder/index_parser.mli @@ -38,4 +38,4 @@ and entry = { proxy : Downloader.proxy_mode; } -val get_index : prog:string -> verbose:bool -> downloader:Downloader.t -> sigchecker:Sigchecker.t -> proxy:Downloader.proxy_mode -> string -> index +val get_index : prog:string -> verbose:bool -> downloader:Downloader.t -> sigchecker:Sigchecker.t -> Sources.sour...

...r items] print the status in the cache of the specified items (which are tuples of name, architecture, and revision). diff --git a/builder/downloader.mli b/builder/downloader.mli index 5e3cdaa..11ec498 100644 --- a/builder/downloader.mli +++ b/builder/downloader.mli @@ -35,7 +35,7 @@ type proxy_mode = val create : curl:string -> cache:Cache.t option -> t (** Create the abstract type. *) -val download : t -> ?template:(string*string*int) -> ?progress_bar:bool -> ?proxy:proxy_mode -> uri -> (filename * bool) +val download : t -> ?template:(string*string*Utils.revision...

...) sources ) in let index = remove_duplicates index in diff --git a/builder/sources.ml b/builder/sources.ml index b774762..b21e8fc 100644 --- a/builder/sources.ml +++ b/builder/sources.ml @@ -27,7 +27,10 @@ type source = { uri : string; gpgkey : Utils.gpgkey_type; proxy : Downloader.proxy_mode; + format : source_format; } +and source_format = +| FormatNative module StringSet = Set.Make (String) @@ -75,8 +78,21 @@ let parse_conf file = ) with Not_found -> Downloader.SystemProxy in + let format = + try + (match (List...

Move the Curl wrapper module from virt-v2v to mllib. Use the module when virt-builder issues curl calls. Rich.

...tion; + revision : int; + format : string option; + size : int64; + compressed_size : int64 option; + expand : string option; + lvexpand : string option; + notes : (string * string) list; + hidden : bool; + aliases : string list option; + + sigchecker : Sigchecker.t; + proxy : Downloader.proxy_mode; +} + +let print_entry chan (name, { printable_name = printable_name; + file_uri = file_uri; + arch = arch; + osinfo = osinfo; + signature_uri = signature_uri; +...

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

v2 -> v3: - Changes to the Curl API suggested by Pino.

v1 -> v2: - Fixed the bug with precedence of if / @. - Add some imperative list operators inspired by Perl, and use those for constructing the Curl arguments, and more. 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. TODO items: - check the pasted metadata: listing and creating images works, so most of the current metadata is correct - possibly wait

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

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

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

...loader.ml index 0c91cbb..30ca212 100644 --- a/builder/downloader.ml +++ b/builder/downloader.ml @@ -28,7 +28,6 @@ type uri = string type filename = string type t = { - verbose : bool; curl : string; cache : Cache.t option; (* cache for templates *) } @@ -38,8 +37,7 @@ type proxy_mode = | SystemProxy | ForcedProxy of string -let create ~verbose ~curl ~cache = { - verbose = verbose; +let create ~curl ~cache = { curl = curl; cache = cache; } @@ -88,7 +86,7 @@ and download_to t ?(progress_bar = false) ~proxy uri filename = | "file" -> let path =...