Libguestfs - Oct 2015 - [PATCH] builder: Remove duplicate planner transition.

Seems to be a copy and paste bug in
commit 62cc7d3361127b4e007f8e23028213852be09124.
---
 builder/builder.ml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/builder/builder.ml b/builder/builder.ml
index af9c2f5..6850f8f 100644
--- a/builder/builder.ml
+++ b/builder/builder.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);
-      );
 
       (* qemu-img convert is always possible, and quicker.  It doesn't
        * resize, but it does change the format.
-- 
2.5.0

On Tuesday 06 October 2015 11:22:49 Richard W.M. Jones
wrote:
> Seems to be a copy and paste bug in
> commit 62cc7d3361127b4e007f8e23028213852be09124.
> ---
>  builder/builder.ml | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/builder/builder.ml b/builder/builder.ml
> index af9c2f5..6850f8f 100644
> --- a/builder/builder.ml
> +++ b/builder/builder.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);
> -      );
>  
>        (* qemu-img convert is always possible, and quicker.  It doesn't
>         * resize, but it does change the format.
LGTM.

Thanks,
-- 
Pino Toscano