diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-12-12 01:11:06 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-12-12 18:11:33 +0200 |
| commit | 01cf06a63787747446ea4b86c62289702c98e694 (patch) | |
| tree | 97ef8ae1ccd33b9d9c2fbb91930acccff14616e8 /main/augeas/0014-Shellvars-allow-command-specific-environment-variabl.patch | |
| parent | 6ef1728084d139a7ad7e47b2543211e1ebe4d74d (diff) | |
| download | aports-01cf06a63787747446ea4b86c62289702c98e694.tar.bz2 aports-01cf06a63787747446ea4b86c62289702c98e694.tar.xz | |
main/augeas: align patch set with upstream
Diffstat (limited to 'main/augeas/0014-Shellvars-allow-command-specific-environment-variabl.patch')
| -rw-r--r-- | main/augeas/0014-Shellvars-allow-command-specific-environment-variabl.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/main/augeas/0014-Shellvars-allow-command-specific-environment-variabl.patch b/main/augeas/0014-Shellvars-allow-command-specific-environment-variabl.patch deleted file mode 100644 index 66e6cb7460..0000000000 --- a/main/augeas/0014-Shellvars-allow-command-specific-environment-variabl.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 9700827d26dbb59bb800c9e5ab39f0bc5c598fbd Mon Sep 17 00:00:00 2001 -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -Date: Fri, 26 Dec 2014 13:27:13 +0200 -Subject: [PATCH 14/15] Shellvars: allow command-specific environment variables - ---- - lenses/shellvars.aug | 4 +++- - lenses/tests/test_shellvars.aug | 9 ++++++++- - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug -index 36a0141..00c6846 100644 ---- a/lenses/shellvars.aug -+++ b/lenses/shellvars.aug -@@ -110,7 +110,9 @@ module Shellvars = - let command = - let reserved_key = /exit|shift|return|ulimit|unset|export|source|\.|if|for|select|while|until|then|else|fi|done|case/ - in let word = /[A-Za-z0-9_.-\/]+/ -- in Util.indent . label "@command" . store (word - reserved_key) -+ in Util.indent . label "@command" -+ . [ key key_re . eq . store anyquot . Sep.space . del /(\\\\\n[ \t]*)?/ "" ]* -+ . store (word - reserved_key - /zzz/) - . [ Sep.space . label "@arg" . sto_to_semicol]? - - (************************************************************************ -diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug -index e7fad5a..4f52205 100644 ---- a/lenses/tests/test_shellvars.aug -+++ b/lenses/tests/test_shellvars.aug -@@ -609,7 +609,9 @@ esac\n" = - test Shellvars.lns get "echo foobar 'and this is baz' - /usr/local/bin/myscript.sh with args - echo foo \ --bar\n" = -+bar -+abc=def \ -+ ghi=\"jkl mno\" command arg1 arg2\n" = - { "@command" = "echo" - { "@arg" = "foobar 'and this is baz'" } - } -@@ -620,6 +622,11 @@ bar\n" = - { "@arg" = "foo \ - bar" } - } -+ { "@command" = "command" -+ { "abc" = "def" } -+ { "ghi" = "\"jkl mno\"" } -+ { "@arg" = "arg1 arg2" } -+ } - - (* Local Variables: *) - (* mode: caml *) --- -2.1.0 - |