search for: d232a3a

...pdir:string -> cache:Cache.t option -> t (** Create the abstract type. *) val download : t -> ?template:(string*string*Utils.revision) -> ?progress_bar:bool -> ?proxy:Curl.proxy -> uri -> (filename * bool) diff --git a/builder/index_parser.ml b/builder/index_parser.ml index d232a3a..e5e4c6c 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -32,7 +32,7 @@ let get_index ~downloader ~sigchecker let rec get_index () = (* Get the index page. *) - let tmpfile, delete_tmpfile = Downloader.download downloader ~proxy uri in + let tmpfile, _ = Downlo...

...pdir:string -> cache:Cache.t option -> t (** Create the abstract type. *) val download : t -> ?template:(string*string*Utils.revision) -> ?progress_bar:bool -> ?proxy:Curl.proxy -> uri -> (filename * bool) diff --git a/builder/index_parser.ml b/builder/index_parser.ml index d232a3a..e5e4c6c 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -32,7 +32,7 @@ let get_index ~downloader ~sigchecker let rec get_index () = (* Get the index page. *) - let tmpfile, delete_tmpfile = Downloader.download downloader ~proxy uri in + let tmpfile, _ = Downlo...

...@@ -35,7 +35,7 @@ and entry = { aliases : string list option; sigchecker : Sigchecker.t; - proxy : Downloader.proxy_mode; + proxy : Curl.proxy option; } val print_entry : out_channel -> (string * entry) -> unit diff --git a/builder/index_parser.ml b/builder/index_parser.ml index d232a3a..4ac66c0 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -32,7 +32,7 @@ let get_index ~downloader ~sigchecker let rec get_index () = (* Get the index page. *) - let tmpfile, delete_tmpfile = Downloader.download downloader ~proxy uri in + let tmpfile, delete_tmp...

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

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

...e. *) - let filename_new = filename ^ "." ^ string_random8 () in + let filename_new = filename ^ "." ^ String.random8 () in unlink_on_exit filename_new; (match parseduri.URI.protocol with diff --git a/builder/index_parser.ml b/builder/index_parser.ml index 2c78fd9..d232a3a 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -165,7 +165,7 @@ let get_index ~downloader ~sigchecker corrupt_file () in let aliases = let l = - try string_nsplit " " (List.assoc ("aliases", None) fields)...

Hide/prevent the use of bad string functions like String.lowercase. These are replaced by safe functions that won't break UTF-8 strings. Other miscellaneous refactoring. Rich.

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.