search for: open_temp_fil

...ls open JSON_parser open Common_gettext.Gettext +open Utils + (* Run qemu-img measure on a disk. *) let measure ?format filename = @@ -38,8 +40,7 @@ let measure ?format filename = List.push_back cmd "--output=json"; List.push_back cmd filename; - let json, chan = Filename.open_temp_file "v2vmeasure" ".json" in - unlink_on_exit json; + let json, chan = Filename.open_temp_file ~temp_dir:tmpdir "v2vmeasure" ".json" in let fd = Unix.descr_of_out_channel chan in if run_command ~stdout_fd:fd !cmd <> 0 then error (f_"qemu-i...

Since this new temporary directory will contain UNIX sockets for communicating with nbdkit, then its path must not be too long. Use the existing directory that libguestfs exposes for this, i.e. sockdir. --- v2v/nbdkit.ml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/v2v/nbdkit.ml b/v2v/nbdkit.ml index 65317f9b..46b20c9d 100644 --- a/v2v/nbdkit.ml +++ b/v2v/nbdkit.ml

...> + (* In debug mode output the python code into the log. *) > + debug "running python code using ‘%s’:\n%s" python code; > + > + (* Write the Python code to a temporary file so we don't have to > + * quote things. > + *) > + let filename, chan = Filename.open_temp_file "py" ".py" in > + output_string chan code; > + close_out chan; > + > + let cmd = sprintf "%s %s" (quote python) filename in quote filename Tomas > + let lines = external_command cmd in > + Unix.unlink filename; > + lines > + > +...

- refactor memoization code - pass pod as stdin rather than files Pino Toscano (3): generator: isolate memoized cache in own module generator: adjust variable names generator: improve pod2text invocation generator/Makefile.am | 3 ++ generator/memoized_cache.ml | 62 +++++++++++++++++++++ generator/memoized_cache.mli | 29 ++++++++++ generator/utils.ml | 101

...ut_libvirt oc output_pool = object (* Create the metadata. *) let doc = - create_libvirt_xml ~pool:output_pool source target_buses + create_libvirt_xml ~pool:pool_name source target_buses guestcaps target_features target_firmware in let tmpfile, chan = Filename.open_temp_file "v2vlibvirt" ".xml" in -- 2.7.4

Much similar to unlink_on_exit, but recursively cleaning directories. --- mllib/common_utils.ml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 3943417..f49ede6 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -386,6 +386,35 @@ let unlink_on_exit = registered_handlers := true )

...essed file, returning the + * type of the uncompressed content (if known). + *) +let uncompressed_type format file = + let zcat = match format with `GZip -> "zcat" | `XZ -> "xzcat" in + let head, headlen = uncompress_head zcat file in + let tmpfile, chan = + Filename.open_temp_file "ova.file." "" in + output chan head 0 headlen; + close_out chan; + let ret = detect_file_type tmpfile in + Sys.remove tmpfile; + ret + class input_ova ova = let tmpdir = let base_dir = (open_guestfs ())#get_cachedir () in @@ -52,17 +115,6 @@ object method as_o...

...f --git a/mllib/curl.ml b/mllib/curl.ml index f0af160..d7983ec 100644 --- a/mllib/curl.ml +++ b/mllib/curl.ml @@ -20,10 +20,32 @@ open Printf open Common_utils -type curl_args = (string * string option) list +let quote = Filename.quote -let run curl_args = - let config_file, chan = Filename.open_temp_file "v2vcurl" ".conf" in +type t = { + curl : string; + args : args; +} +and args = (string * string option) list + +let safe_args = [ + "max-redirs", Some "5"; + "globoff", None; (* Don't glob URLs. *) +] + +type proxy = UnsetProxy | S...

...f --git a/mllib/curl.ml b/mllib/curl.ml index f0af160..a684fdb 100644 --- a/mllib/curl.ml +++ b/mllib/curl.ml @@ -20,10 +20,19 @@ open Printf open Common_utils -type curl_args = (string * string option) list +let quote = Filename.quote -let run curl_args = - let config_file, chan = Filename.open_temp_file "v2vcurl" ".conf" in +type t = { + curl : string; + args : args; +} +and args = (string * string option) list + +let create ?(curl = "curl") args = + { curl = curl; args = args } + +let run { curl = curl; args = args } = + let config_file, chan = Filename.open_tem...

...let r = Sys.command cmd in > @@ -188,23 +206,40 @@ and do_verify t args = > exit 1 > ) > > -(* Import the default public key. *) > +(* Import the requested public key. *) > and import_key t = > - if not !key_imported then ( > - let filename, chan = Filename.open_temp_file "vbpubkey" ".asc" in > - unlink_on_exit filename; > - output_string chan default_pubkey; > - close_out chan; > - > - let cmd = sprintf "%s --import %s%s" > - t.gpg (quote filename) > + if not t.key_imported then ( > + let k...

...args = +let create ?(curl = "curl") ?(proxy = SystemProxy) ?tmpdir args = let args = safe_args @ args_of_proxy proxy @ args in - { curl = curl; args = args } + { curl = curl; args = args; tmpdir = tmpdir } -let run { curl = curl; args = args } = - let config_file, chan = Filename.open_temp_file "guestfscurl" ".conf" in +let run { curl = curl; args = args; tmpdir = tmpdir } = + let config_file, chan = Filename.open_temp_file ?temp_dir:tmpdir + "guestfscurl" ".conf" in List.iter ( function | name, None -> fprintf chan "%s\n&q...

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

...python = "python") code = + (* In debug mode output the python code into the log. *) + debug "running python code using ‘%s’:\n%s" python code; + + (* Write the Python code to a temporary file so we don't have to + * quote things. + *) + let filename, chan = Filename.open_temp_file "py" ".py" in + output_string chan code; + close_out chan; + + let cmd = sprintf "%s %s" (quote python) filename in + let lines = external_command cmd in + Unix.unlink filename; + lines + +let py_quote str = + let str = String.replace str "\\" "\...

...od2text_memo_key = int option * bool * bool * string * string (* width, trim, discard, name, longdesc *) type pod2text_memo_value = string list (* list of lines of POD file *) let run_pod2text (width, trim, discard, name, longdesc) = - let filename, chan = Filename.open_temp_file "gen" ".tmp" in - fprintf chan "=encoding utf8\n\n"; - fprintf chan "=head1 %s\n\n%s\n" name longdesc; - close_out chan; let cmd = match width with | Some width -> - sprintf "pod2text -w %d %s" width (Filename.quote filena...

...args = +let create ?(curl = "curl") ?(proxy = SystemProxy) ?tmpdir args = let args = safe_args @ args_of_proxy proxy @ args in - { curl = curl; args = args } + { curl = curl; args = args; tmpdir = tmpdir } -let run { curl = curl; args = args } = - let config_file, chan = Filename.open_temp_file "guestfscurl" ".conf" in +let run { curl = curl; args = args; tmpdir = tmpdir } = + let config_file, chan = Filename.open_temp_file ?temp_dir:tmpdir + "guestfscurl" ".conf" in List.iter ( function | name, None -> fprintf chan "%s\n&q...

...utput_conn output_password output_storage * '-f json' to the args yourself. *) let run_openstack_command_capture_json args = - let cmd = [ "openstack" ] @ extra_args @ args in + let cmd = [ openstack_binary ] @ extra_args @ args in let json, chan = Filename.open_temp_file "v2vopenstack" ".json" in unlink_on_exit json; @@ -366,6 +376,9 @@ object inherit output method precheck () = + (* Check the openstack command exists. *) + error_unless_openstack_command_exists (); + (* Run the openstack command simply to check we can co...

...let t = Mkdtemp.temp_dir ~base_dir:large_tmpdir "ova." in rmdir_on_exit t; t in @@ -221,8 +220,7 @@ and uncompress_head format file = *) and uncompressed_type format file = let head, headlen = uncompress_head format file in - let tmpfile, chan = - Filename.open_temp_file "ova.file." "" in + let tmpfile, chan = Filename.open_temp_file "ova.file." "" in output chan head 0 headlen; close_out chan; let ret = detect_file_type tmpfile in diff --git a/v2v/python_script.ml b/v2v/python_script.ml index 33c5e9a21..127cd0bb2...

...ditions in both places. > + if verbose () then > + eprintf "command: %s %s\n%!" > + prog (String.concat " " args); stringify_args could help here. > + let argv = Array.of_list (prog :: args) in > + > + let stdout_file, stdout_chan = Filename.open_temp_file "cmd" ".out" in > + let stderr_file, stderr_chan = Filename.open_temp_file "cmd" ".err" in > + let stdout_fd = descr_of_out_channel stdout_chan in > + let stderr_fd = descr_of_out_channel stderr_chan in > + let stdin_fd = openfile "/dev/...

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

...(* Create the metadata. *) let doc = create_libvirt_xml ~pool:pool_name source targets target_buses - guestcaps target_features target_firmware in + guestcaps target_features target_firmware inspect in let tmpfile, chan = Filename.open_temp_file "v2vlibvirt" ".xml" in DOM.doc_to_chan chan doc; diff --git a/v2v/output_local.ml b/v2v/output_local.ml index 2f4b4e6c9cfd..3a00ed58a72d 100644 --- a/v2v/output_local.ml +++ b/v2v/output_local.ml @@ -49,7 +49,7 @@ class output_local dir = object error_unless_uefi_f...