Revert "lenses/fstab.aug: Allow comma after the last option (hercules…

…-team#838)" A more general fix will follow. This reverts commit 5246ef0. Signed-off-by: Richard W.M. Jones <[email protected]>
rwmjones · Feb 4, 2025 · 34442c5 · 34442c5
1 parent cd37b09
commit 34442c5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/lenses/fstab.aug b/lenses/fstab.aug
@@ -5,7 +5,6 @@ module Fstab =
 
   let sep_tab = Sep.tab
   let sep_spc = Sep.space
-  let sep_comma_tab = del /,?[ \t]+/ "\t"
   let comma   = Sep.comma
   let eol     = Util.eol
 
@@ -29,7 +28,7 @@ module Fstab =
                    [ label "file" . store file ] . sep_tab .
                    comma_sep_list "vfstype" .
                    (sep_tab . comma_sep_list "opt" .
-                    (sep_comma_tab . [ label "dump" . store /[0-9]+/ ] .
+                    (sep_tab . [ label "dump" . store /[0-9]+/ ] .
                      ( sep_spc . [ label "passno" . store /[0-9]+/ ])? )? )?
                  . Util.comment_or_eol ]
 

diff --git a/lenses/tests/test_fstab.aug b/lenses/tests/test_fstab.aug
@@ -156,17 +156,6 @@ module Test_fstab =
     { "#comment" = "device at install: /dev/sda3" }
   }
 
-  (* Bug #832 - Allow comma after the last option *)
-  test Fstab.lns get "/dev/mapper/foo-bar / xfs defaults, 0 0\n" =
-  { "1"
-    { "spec" = "/dev/mapper/foo-bar" }
-    { "file" = "/" }
-    { "vfstype" = "xfs" }
-    { "opt" = "defaults" }
-    { "dump" = "0" }
-    { "passno" = "0" }
-  }
-
 (* Local Variables: *)
 (* mode: caml       *)
 (* End:             *)