[augeas-devel] [PATCH] Parse option values in fstab.aug, adapt test file accordingly.

[Raphaël Pinson]

Committed as aa1b21fe5e6ee7380c3d15ca79412e143c08c496

On Wed, Oct 27, 2010 at 3:03 PM, Raphael Pinson <raphink at gmail.com> wrote:

> ---
>  lenses/fstab.aug            |    9 +++++----
>  lenses/tests/test_fstab.aug |   15 ++++++++++-----
>  2 files changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/lenses/fstab.aug b/lenses/fstab.aug
> index 540efff..6a6f5ef 100644
> --- a/lenses/fstab.aug
> +++ b/lenses/fstab.aug
> @@ -11,16 +11,17 @@ module Fstab =
>   let comment = Util.comment
>   let empty   = Util.empty
>
> -  let word    = Rx.neg1
> +  let word    = Rx.word
>   let spec    = /[^,# \n\t][^ \n\t]*/
>
>   let comma_sep_list (l:string) =
> -    let lns = [ label l . store word ] in
> -       Build.opt_list lns comma
> +    let value = [ label "value" . Util.del_str "=" . store word ] in
> +      let lns = [ label l . store word . value? ] in
> +         Build.opt_list lns comma
>
>   let record = [ seq "mntent" .
>                    [ label "spec" . store spec ] . sep_tab .
> -                   [ label "file" . store word ] . sep_tab .
> +                   [ label "file" . store Rx.neg1 ] . sep_tab .
>                    comma_sep_list "vfstype" . sep_tab .
>                    comma_sep_list "opt" .
>                    (sep_tab . [ label "dump" . store /[0-9]+/ ] .
> diff --git a/lenses/tests/test_fstab.aug b/lenses/tests/test_fstab.aug
> index cf6412c..ac6b4ef 100644
> --- a/lenses/tests/test_fstab.aug
> +++ b/lenses/tests/test_fstab.aug
> @@ -42,8 +42,10 @@ module Test_fstab =
>         { "spec" = "devpts" }
>         { "file" = "/dev/pts" }
>         { "vfstype" = "devpts" }
> -        { "opt" = "gid=5" }
> -        { "opt" = "mode=620" }
> +        { "opt" = "gid"
> +            { "value" = "5" } }
> +        { "opt" = "mode"
> +            { "value" = "620" } }
>         { "dump" = "0" }
>         { "passno" = "0" } }
>
> @@ -76,9 +78,12 @@ module Test_fstab =
>     { "spec" = "sshfs#jon at 10.0.0.2:/home" }
>     { "file" = "/media/server" }
>     { "vfstype" = "fuse" }
> -    { "opt" = "uid=1000" }
> -    { "opt" = "gid=100" }
> -    { "opt" = "port=1022" }
> +    { "opt" = "uid"
> +         { "value" = "1000" } }
> +    { "opt" = "gid"
> +         { "value" = "100" } }
> +    { "opt" = "port"
> +         { "value" = "1022" } }
>     { "dump" = "0" }
>     { "passno" = "0" } }
>
> --
> 1.7.0.4
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/augeas-devel/attachments/20101103/33be69e4/attachment.htm>