diff options
Diffstat (limited to 'main/augeas/0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch')
-rw-r--r-- | main/augeas/0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/main/augeas/0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch b/main/augeas/0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch deleted file mode 100644 index 14e2a20281..0000000000 --- a/main/augeas/0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cd7c5cf9a3c3e96c53369ee1dbb25c1748dc0f91 Mon Sep 17 00:00:00 2001 -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -Date: Thu, 4 Dec 2014 18:25:12 +0200 -Subject: [PATCH 06/19] Shellvars: allow wrapping builtin arguments to multiple - lines - ---- - lenses/shellvars.aug | 4 +--- - lenses/tests/test_shellvars.aug | 5 +++++ - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug -index 78b1d16..227e2a3 100644 ---- a/lenses/shellvars.aug -+++ b/lenses/shellvars.aug -@@ -46,9 +46,7 @@ module Shellvars = - let dollar_arithm = /\$\(\([^\)#\n]*\)\)/ - - let anyquot = (char|dquot|squot|dollar_assign|dollar_arithm)+ | bquot | dbquot -- -- let to_semicol_re = /[^#; \t\n][^#;\n]+[^#; \t\n]|[^#; \t\n]+/ -- let sto_to_semicol = store to_semicol_re -+ let sto_to_semicol = store (anyquot . (Rx.space . anyquot)*) - - let sto_to_semicol_quot = - let no_semicol_re = /[^"'#;\n]/ -diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug -index 065130a..bf92735 100644 ---- a/lenses/tests/test_shellvars.aug -+++ b/lenses/tests/test_shellvars.aug -@@ -165,6 +165,11 @@ unset ONBOOT # We do not want this var - { "@builtin" = "exit" } - { "@builtin" = "exit" { "args" = "2" } } - -+ (* Allow wrapping builtin arguments to multiple lines *) -+ test Shellvars.lns get "ulimit -c \\\nunlimited\nulimit \\\n -x 123\n" = -+ { "@builtin" = "ulimit" { "args" = "-c \\\nunlimited" } } -+ { "@builtin" = "ulimit" { "args" = "\\\n -x 123" } } -+ - (* Test semicolons *) - test lns get "VAR1=\"this;is;a;test\"\nVAR2=this;\n" = - { "VAR1" = "\"this;is;a;test\"" } --- -2.5.0 - |