search for: quiet_arg

...uilder/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 code to stdout. *) - "write-out", Some "%{http_code}"; -...

...+ + (* Any other protocol. *) + | _ -> + let common_args = + Curl.safe_args @ + [ "location", None ] @ (* Follow 3XX redirects. *) + match proxy with + | None (* system proxy settings *) -> [] + | Some proxy -> Curl.args_of_proxy proxy in + + let quiet_args = [ "silent", None; "show-error", None ] in + (* Get the status code first to ensure 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 &quo...

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

Move the Curl wrapper module from virt-v2v to mllib. Use the module when virt-builder issues curl calls. 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.

...- 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 ignore (Curl.run curl_h) ); diff --git a/builder/downloader.mli b/builder/downloader.mli index c99aee2..7f39f7e 100644 --- a/builder/downloader.mli +++ b/builder/downl...

...- 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 ignore (Curl.run curl_h) ); diff --git a/builder/downloader.mli b/builder/downloader.mli index c99aee2..7f39f7e 100644 --- a/builder/downloader.mli +++ b/builder/downl...

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

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

...ORKDIR=$WORKDIR" +debug "preserve=$preserve" +debug "server_url=$server_url" + +debug "Notifying $servername:$serverport that $hostname is awake." + +# get the url for the keytab file +debug "Writing server response to: ${tmpfile}" + +if ! $verbose; then QUIET_ARG="-q"; fi + +wget --output-document="$tmpfile" $QUIET_ARG \ + --no-check-certificate "${server_url}" \ + --post-data="content=\"$(base64 ${awake_content})\"" + +if [ -f $tmpfile ]; then + debug "Extracting the server response from $tmpf...