search for: curl_h

...--git a/builder/downloader.ml b/builder/downloader.ml index 3c9ba18..2a3f76f 100644 --- a/builder/downloader.ml +++ b/builder/downloader.ml @@ -95,17 +95,17 @@ and download_to t ?(progress_bar = false) ~proxy uri filename = (* Get the status code first to ensure the file exists. *) let curl_h = - let curl_args = - common_args @ - (if verbose () then [] else quiet_args) @ [ - "output", Some "/dev/null"; (* Write output to /dev/null. *) - "head", None; (* Request only HEAD. *) - (* Write HTTP status...

...in let curl_args = if sslverify then curl_args else ("insecure", None) :: curl_args in @@ -213,9 +213,10 @@ read the man page virt-v2v-copy-to-local(1). if quiet () then ("silent", None) :: curl_args else curl_args in + let curl_h = Curl.create curl_args in if verbose () then - Curl.print_curl_command stderr curl_args; - ignore (Curl.run curl_args) + Curl.print stderr curl_h; + ignore (Curl.run curl_h) | Test -> let cmd = [ "cp"; remote_disk; local_disk ] in dif...

...in let curl_args = if sslverify then curl_args else ("insecure", None) :: curl_args in @@ -213,9 +214,10 @@ read the man page virt-v2v-copy-to-local(1). if quiet () then ("silent", None) :: curl_args else curl_args in + let curl_h = Curl.create curl_args in if verbose () then - Curl.print_curl_command stderr curl_args; - ignore (Curl.run curl_args) + Curl.print stderr curl_h; + ignore (Curl.run curl_h) | Test -> let cmd = [ "cp"; remote_disk; local_disk ] in dif...

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

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.

...nsure the file exists. *) - let cmd = sprintf "%s%s%s -L --max-redirs 5 -g -o /dev/null -I -w '%%{http_code}' %s" - outenv - t.curl - (if verbose () then "" else " -s -S") - (quote uri) in - let lines = external_command cmd in + let curl_h = + let curl_args = + common_args @ + if verbose () then [] else quiet_args @ [ + "output", Some "/dev/null"; (* Write output to /dev/null. *) + "head", None; (* Request only HEAD. *) + (* Write HTTP status co...

...oad_to t ?(progress_bar = false) ~proxy uri filename = "write-out", Some "%{http_code}" (* HTTP status code to stdout. *) ]; - Curl.create ~curl:t.curl !curl_args in + Curl.create ~curl:t.curl ~tmpdir:t.tmpdir !curl_args in let lines = Curl.run curl_h in if List.length lines < 1 then @@ -132,7 +134,7 @@ and download_to t ?(progress_bar = false) ~proxy uri filename = else append curl_args quiet_args ); - Curl.create ~curl:t.curl !curl_args in + Curl.create ~curl:t.curl ~tmpdir:t.tmpdir !curl_args in igno...

...oad_to t ?(progress_bar = false) ~proxy uri filename = "write-out", Some "%{http_code}" (* HTTP status code to stdout. *) ]; - Curl.create ~curl:t.curl !curl_args in + Curl.create ~curl:t.curl ~tmpdir:t.tmpdir !curl_args in let lines = Curl.run curl_h in if List.length lines < 1 then @@ -132,7 +134,7 @@ and download_to t ?(progress_bar = false) ~proxy uri filename = else append curl_args quiet_args ); - Curl.create ~curl:t.curl !curl_args in + Curl.create ~curl:t.curl ~tmpdir:t.tmpdir !curl_args in igno...

The first commit removes the --dcpath parameter, which just makes the following stuff simpler. Since libvirt has supported getting datacenterpath from VMware since Oct 2015, it's time to drop this hairy parameter. The rest is quite a complicated series of refactorings, followed by a very simple change to add handling of snapshots taken from old virt-v2v. Rich.

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 +++

Patch 1 was previously posted here: https://www.redhat.com/archives/libguestfs/2020-June/msg00086.html to handle this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1848862 I was able to observe this bug and for me at least disabling readahead seems to cure it. Patches 2 and 3 are simplifications, removing a now-undocumented feature of virt-v2v-copy-to-local and thus simplifying greatly the

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

v2 -> v3: - Renamed List.assoc_ -> List.assoc_lbl. - Rebased on top of current master branch. Rich.

In Std_utils we already extend Char and String. These commits take it a little further by extending List and adding a new Option submodule. All basically simple refactoring. Rich.

This time including the first commit ...