diff options
author | Axel Beckert <abe@deuxchevaux.org> | 2023-07-05 02:27:43 +0200 |
---|---|---|
committer | Axel Beckert <abe@deuxchevaux.org> | 2023-07-05 18:55:51 +0200 |
commit | 138340f908926ef5bfbc3e82b1ca1cc9a97de22c (patch) | |
tree | bdf12e2df4bdd3202e99dfefb9d10b2e6a35d8d8 /debian/patches/cherry-pick-4b7a9fd0-additional-typset--p--m-fix-for-namespaces.patch | |
parent | d2a99aa86a81f1ad931ab2d3bf8a5ba28c2ed0d4 (diff) | |
download | zsh-138340f908926ef5bfbc3e82b1ca1cc9a97de22c.tar.gz zsh-138340f908926ef5bfbc3e82b1ca1cc9a97de22c.zip |
Cherry pick multiple upstream commits to migrate pcre module to pcre2.
Update Build-Depends and Build-Using from libpcre3-dev to libpcre2-dev
accordingly.
Closes: #999918
Gbp-Dch: Full
Diffstat (limited to 'debian/patches/cherry-pick-4b7a9fd0-additional-typset--p--m-fix-for-namespaces.patch')
-rw-r--r-- | debian/patches/cherry-pick-4b7a9fd0-additional-typset--p--m-fix-for-namespaces.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/debian/patches/cherry-pick-4b7a9fd0-additional-typset--p--m-fix-for-namespaces.patch b/debian/patches/cherry-pick-4b7a9fd0-additional-typset--p--m-fix-for-namespaces.patch new file mode 100644 index 000000000..98105eff6 --- /dev/null +++ b/debian/patches/cherry-pick-4b7a9fd0-additional-typset--p--m-fix-for-namespaces.patch @@ -0,0 +1,25 @@ +commit 4b7a9fd0ecb750646cac76c41383f8391cd0fdd9 +Author: Bart Schaefer <schaefer@zsh.org> +Date: Tue Mar 14 20:51:15 2023 -0700 + + [partial cherry-pick] 51573: additional "typset -p -m" fix for namespaces + + The "-m pattern" option is supposed to enable printing namespaces, but + that didn't work when combined with -p. + + The -p option could also cause an unset parameter to become set if a + named reference pointed at it. + +diff --git a/Src/builtin.c b/Src/builtin.c +index d99802f5f..f38a54936 100644 +--- a/Src/builtin.c ++++ b/Src/builtin.c +@@ -2502,6 +2502,8 @@ typeset_single(char *cname, char *pname, Param pm, int func, + "%s: inconsistent array element or slice assignment", pname); + return NULL; + } ++ } else if (!pm && OPT_ISSET(ops,'p')) { ++ return NULL; + } + /* + * As we can hide existing parameters, we allow a name if |