[Libguestfs] [PATCH v2] mlcustomize: Trim whitespaces from commands read from file (RHBZ#1351000)

Richard W.M. Jones rjones at redhat.com
Wed Jan 29 16:22:51 UTC 2020


On Wed, Jan 29, 2020 at 03:07:12PM +0100, Martin Kletzander wrote:
> From: Martin Kletzander <mkletzan at redhat.com>
> 
> The first split does not care about the whole string, it is just trying to get
> the command name in front, so triml is just right.
> 
> Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
> ---
>  mlcustomize/customize_cmdline.ml | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/mlcustomize/customize_cmdline.ml b/mlcustomize/customize_cmdline.ml
> index c062379879e2..abd21a4cbca5 100644
> --- a/mlcustomize/customize_cmdline.ml
> +++ b/mlcustomize/customize_cmdline.ml
> @@ -481,6 +481,7 @@ let rec argspec () =
>      ] in
>      let lines = read_whole_file filename in
>      let lines = String.lines_split lines in
> +    let lines = List.map String.triml lines in
>      let lines = List.filter (
>        fun line ->
>          String.length line > 0 && line.[0] <> '#'

Seems OK to me, so ACK.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v




More information about the Libguestfs mailing list