search for: itag

...ns(+), 12 deletions(-) diff --git a/builder/builder.ml b/builder/builder.ml index a4c830e89..843106a86 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -413,6 +413,8 @@ let main () = let remove = List.remove_assoc in let ret = ref [] in + let infile = List.assoc `Filename itags in + (* The scheme for weights ranges from 0 = free to 100 = most expensive: * * 0 = free operations like renaming a file in the same directory @@ -433,8 +435,7 @@ let main () = * We could estimate weights better by looking at file sizes. *) let weight task ota...

...able if both source + * and destination hit the same device (except in the special + * case of moving within a filesystem which is free). + * + * We could estimate weights better by looking at file sizes. *) + let weight task otags = + let infile = List.assoc `Filename itags + and outfile = List.assoc `Filename otags in + + (* If infile/outfile don't exist, get the containing directory. *) + let infile = + if Sys.file_exists infile then infile else Filename.dirname infile in + let outfile = + if Sys.file_exists outfile then outfil...

Previous patch contained a typo. Changed output_format -> output_filename. Rich.

...lder.ml @@ -456,10 +456,9 @@ let main () = * Don't run 'qemu-img resize' on an auto format. This is to * force an explicit conversion step to a real format. *) - else if output_size > old_size && is_not `Template && List.mem_assoc `Format itags then ( + else if output_size > old_size && is_not `Template + && List.mem_assoc `Format itags then tr `Disk_resize 60 ((`Size, Int64.to_string output_size) :: itags); - tr `Disk_resize 60 ((`Size, Int64.to_string output_size) :: itags); - )...

v2 -> v3: - Drop gnulib fallback.

It started out as "this'll be just a simple fix ..." and turned into something a bit over-engineered in the end. Here it is anyway. Rich.

v1 -> v2: - Removed the f_type field from StatVFS.statvfs structure. - New function StatVFS.filesystem_is_remote, written in C. [Thinking about it, this should probably be called ?is_network_filesystem?, but I can change that before pushing]. - Use statvfs instead of fstatvfs, and statfs instead of fstatfs. - Rejigged the comments in builder/builder.ml to make them simpler

.../builder/builder.ml b/builder/builder.ml index 957bc37..3750e5f 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -378,6 +378,8 @@ let main () = goal_must, goal_must_not in + let cache_dir = (open_guestfs ())#get_cachedir () in + (* Planner: Transitions. *) let transitions itags = let is t = List.mem_assoc t itags in @@ -394,7 +396,7 @@ let main () = (* Since the final plan won't run in parallel, we don't only need * to choose unique tempfiles per transition, so this is OK: *) - let tempfile = Filename.temp_file "vb" ".img&q...

I''m looking for best practice for creating a hyperlink which has both an icon and text. I am currently using this in my view: <%= link_to image_tag(''icons/add.png'', { :align => ''absmiddle'', :border => 0, :size => ''16x16'', :alt => ''New education record'', :title => ''New education

...but when you click on a thumb nothing happens, it just moves up the page. Why is the href=# happening ? The generated html comes after the sample rhtml <%= image_tag @enlargement, :width => "279", :height => "200" %> <% @images.each do |img|%> <% itag = "#{img[:thumb_path]}" %> <% puts "HR: #{itag}" %> <%= link_to_remote image_tag ("#{itag}"), {:update => "enlargement", :url => {:controller => "reunion", :action =&...

Add an optional parameter to disable this behaviour, so the Curl module in v2v won't print user-sensible data (like passwords). --- builder/checksums.ml | 1 - builder/downloader.ml | 1 - builder/sigchecker.ml | 1 - mllib/common_utils.ml | 4 +++- mllib/common_utils.mli | 7 +++++-- v2v/curl.ml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git

...ot;--output"; output ]) @ + [ "--add"; cmdline.arg ] in + exit (run_command (Array.of_list cmd)) | `Delete_cache -> (* --delete-cache *) (match cmdline.cache with @@ -550,14 +549,14 @@ let main () = let ifile = List.assoc `Filename itags in let ofile = List.assoc `Filename otags in message (f_"Copying"); - let cmd = sprintf "cp %s %s" (quote ifile) (quote ofile) in - if shell_command cmd <> 0 then exit 1 + let cmd = [| "cp"; ifile; ofile |] in + if run_command c...

On Tue, Nov 21, 2017 at 3:55 AM, Pino Toscano <ptoscano@redhat.com> wrote: > Hi, > > On Monday, 20 November 2017 22:57:04 CET David Kaylor wrote: > > I was trying out virt-builder and noticed that in some directories I > > receive an error when the image is resized. > > > > For example, if I run the following command from my home directory it > works >

...le = List.assoc `Filename otags in message (f_"Copying"); let cmd = sprintf "cp %s %s" (quote ifile) (quote ofile) in - if verbose () then printf "%s\n%!" cmd; + debug "%s" cmd; if Sys.command cmd <> 0 then exit 1 | itags, `Rename, otags -> let ifile = List.assoc `Filename itags in let ofile = List.assoc `Filename otags in let cmd = sprintf "mv %s %s" (quote ifile) (quote ofile) in - if verbose () then printf "%s\n%!" cmd; + debug "%s" cmd; if S...

Add a Common_utils.debug function for printing messages only when in verbose mode. Rich.

Per my previous email: https://www.redhat.com/archives/libguestfs/2017-September/msg00203.html I'd like to talk about requiring a more modern version of the OCaml compiler. These commits show some of the code changes which would be possible with OCaml >= 3.12 [which it turns out we already require by accident] and also with OCaml >= 4.02. The latter is my favoured option. Rich.

...None + | { Index.signature_uri = Some signature_uri } -> let sigfile, delete_on_exit = Downloader.download downloader signature_uri in if delete_on_exit then unlink_on_exit sigfile; @@ -303,7 +303,7 @@ let main () = (* Planner: Input tags. *) let itags = - let { Index_parser.size = size; format = format } = entry in + let { Index.size = size; format = format } = entry in let format_tag = match format with | None -> [] @@ -341,7 +341,7 @@ let main () = b, sz in let output_size = - let { Index_parser.size =...

...Filename otags in msg (f_"Copying"); let cmd = sprintf "cp %s %s" (quote ifile) (quote ofile) in - if verbose then printf "%s\n%!" cmd; + if verbose () then printf "%s\n%!" cmd; if Sys.command cmd <> 0 then exit 1 | itags, `Rename, otags -> let ifile = List.assoc `Filename itags in let ofile = List.assoc `Filename otags in let cmd = sprintf "mv %s %s" (quote ifile) (quote ofile) in - if verbose then printf "%s\n%!" cmd; + if verbose () then printf "%s\n%!&q...

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

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